diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 73f3dcb7..cb6cca9f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -565,15 +565,17 @@ jobs:
              export newbuilding="${newbase}-building"
              export newresource="${newbase}-resource"
              export newou="aaaGithub Actions/${newbase}"
+             
              # cleanup old runs
-             GAM_CSV_ROW_FILTER="name:regex:gha_test_${JID}" $gam print vaultholds | $gam csv - gam delete vaulthold "id:~~holdId~~" matter "id:~~matterId~~"
-             GAM_CSV_ROW_FILTER="name:regex:gha_test_${JID}" $gam print features | $gam csv - gam delete feature ~name
-             GAM_CSV_ROW_FILTER="name:regex:^gha_test_${JID}" $gam user $gam_user print shareddrives asadmin | $gam csv - gam user $gam_user delete shareddrive ~id nukefromorbit
+             GAM_CSV_ROW_FILTER="name:regex:gha_test_${JID}_" $gam print vaultholds | $gam csv - gam delete vaulthold "id:~~holdId~~" matter "id:~~matterId~~"
+             GAM_CSV_ROW_FILTER="name:regex:gha_test_${JID}_" $gam print features | $gam csv - gam delete feature ~name
+             GAM_CSV_ROW_FILTER="name:regex:^gha_test_${JID}_" $gam user $gam_user print shareddrives asadmin | $gam csv - gam user $gam_user delete shareddrive ~id nukefromorbit
              $gam print users query "gha.jid=$JID" | $gam csv - gam delete user ~primaryEmail
-             GAM_CSV_ROW_FILTER="name:regex:^gha_test_${JID}" $gam print ous fromparent "aaaGithub Actions" | $gam csv - gam delete ou ~orgUnitId
-             GAM_CSV_ROW_FILTER="groupKey.id:regex:^gha_test_${JID}" $gam print cigroups | $gam csv - gam delete cigroup ~groupKey.id
-             GAM_CSV_ROW_FILTER="resourceId:regex:^gha_test_${JID}" $gam print resources | $gam csv - gam delete resource ~resourceId
-             GAM_CSV_ROW_FILTER="buildingId:regex:^gha_test_${JID}" $gam print buildings | $gam csv - gam delete building ~buildingId
+             GAM_CSV_ROW_FILTER="name:regex:^gha_test_${JID}_" $gam print ous fromparent "aaaGithub Actions" | $gam csv - gam delete ou ~orgUnitId
+             GAM_CSV_ROW_FILTER="groupKey.id:regex:^gha_test_${JID}_" $gam print cigroups | $gam csv - gam delete cigroup ~groupKey.id
+             GAM_CSV_ROW_FILTER="resourceId:regex:^gha_test_${JID}_" $gam print resources | $gam csv - gam delete resource ~resourceId
+             GAM_CSV_ROW_FILTER="buildingId:regex:^gha_test_${JID}_" $gam print buildings | $gam csv - gam delete building ~buildingId
+             
              echo "Creating OrgUnit ${newou}"
              $gam create ou "${newou}"
              export GAM_THREADS=5