diff --git a/.github/templates/build.lib.yml b/.github/templates/build.lib.yml
index 5e9159ff41..4a47397bf5 100644
--- a/.github/templates/build.lib.yml
+++ b/.github/templates/build.lib.yml
@@ -43,12 +43,14 @@ deploy-cluster:
     AtlasPrivateKey: #@ secret_AtlasPrivateKey
 #@ end
 
-#@ def cleanupBaas(dependencies = []):
+#@ def cleanupBaas(dependencies = [], targets = []):
 #@ needs = ["deploy-cluster"]
 #@ differentiators = []
 #@ for dependency in dependencies:
 #@   needs.append(getJobName("test", dependency))
-#@   differentiators.append('"' + getJobName("", dependency) + '"')
+#@ end
+#@ for target in targets:
+#@   differentiators.append('"' + getJobName("", target) + '"')
 #@ end
 cleanup-cluster:
   uses: ./.github/workflows/cleanup-baas.yml
diff --git a/.github/templates/main.yml b/.github/templates/main.yml
index 350e8c9feb..71e090cc35 100644
--- a/.github/templates/main.yml
+++ b/.github/templates/main.yml
@@ -95,4 +95,4 @@ jobs:
           dashboard-path: dashboard.charts
           nuget-package: ${{ github.workspace }}/Realm/packages/Realm.${{ needs.build-packages.outputs.package_version }}.nupkg
       - #@ uploadArtifacts("dashboard.charts", "dashboard.charts", 30)
-  _: #@ template.replace(cleanupBaas([".NET Framework", "Code Coverage", "UWP Managed", "Xamarin.macOS", "iOS", "Android", "MacCatalyst"]))
+  _: #@ template.replace(cleanupBaas(dependencies = [".NET Framework", "Code Coverage", "UWP Managed", "MacOS", "iOS", "Android"], targets=[".NET Framework", "Code Coverage", "UWP Managed", "Xamarin.macOS", "iOS", "Android", "MacCatalyst"]))
diff --git a/.github/templates/pr.yml b/.github/templates/pr.yml
index a871f6b95f..1b0cde52e7 100644
--- a/.github/templates/pr.yml
+++ b/.github/templates/pr.yml
@@ -54,7 +54,7 @@ jobs:
     uses: ./.github/workflows/test-weaver.yml
     name: Test
   _: #@ template.replace(runTests("Code Coverage"))
-  _: #@ template.replace(cleanupBaas(["Code Coverage"]))
+  _: #@ template.replace(cleanupBaas(dependencies = ["Code Coverage"], targets = ["Code Coverage"]))
   verify-namespaces:
     runs-on: ubuntu-latest
     name: Verify Namespaces
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 590ec536e1..9b4d63b7b0 100755
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -305,10 +305,9 @@ jobs:
     - test-net-framework
     - test-code-coverage
     - test-uwp-managed
-    - test-xamarinmacos
+    - test-macos
     - test-ios
     - test-android
-    - test-maccatalyst
     with:
       differentiators: '["net-framework", "code-coverage", "uwp-managed", "xamarinmacos", "ios", "android", "maccatalyst"]'
       clusterName: ${{ needs.deploy-cluster.outputs.clusterName }}