diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
index 92f6daff4628..9617544c0932 100644
--- a/eng/pipelines/common/device-tests-steps.yml
+++ b/eng/pipelines/common/device-tests-steps.yml
@@ -6,12 +6,6 @@ parameters:
   provisionatorChannel: 'latest'
 
 steps:
-  - template: agent-cleanser/v1.yml@xamarin-templates
-    parameters:
-      UninstallMono: false
-      UninstallXamarinMac: false
-      CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
-
   - template: provision.yml
     parameters:
       platform: macos
diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml
index 4fd7e4c6b9dc..ed12ed6a39f6 100644
--- a/eng/pipelines/common/pack.yml
+++ b/eng/pipelines/common/pack.yml
@@ -5,12 +5,6 @@ parameters:
   artifact: 'nuget'
 
 steps:
-  - ${{ if eq(parameters.platform, 'macOS') }}:
-    - template: agent-cleanser/v1.yml@xamarin-templates
-      parameters:
-        UninstallMono: false
-        UninstallXamarinMac: false
-        CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
   - template: provision.yml
     parameters:
       platform: ${{ parameters.platform }}
diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
index db81b22974b9..3c821eac2264 100644
--- a/eng/pipelines/common/provision.yml
+++ b/eng/pipelines/common/provision.yml
@@ -18,6 +18,13 @@ steps:
 
   # Prepare macOS
   - ${{ if eq(parameters.platform, 'macos') }}:
+    - template: agent-cleanser/v1.yml@xamarin-templates
+      parameters:
+        UninstallMono: false
+        UninstallXamarinMac: false
+        CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
+        SelfHealPowerShell: false
+        AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
     # Provision Xcode
     - ${{ if ne(parameters.skipXcode, 'true') }}:
       - task: xamops.azdevex.provisionator-task.provisionator@1
@@ -33,6 +40,7 @@ steps:
     - task: xamops.azdevex.provisionator-task.provisionator@1
       displayName: 'Provision Additional Software'
       condition: eq(variables['provisioning'], 'true')
+      continueOnError: true 
       inputs:
         provisioning_script: $(provisionator.path)
         provisioning_extra_args: $(provisionator.extraArguments)
diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
index c76426aac07d..182fb790fd07 100644
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@@ -144,12 +144,6 @@ stages:
                 - Agent.HasDevices -equals False
                 - Agent.IsPaired -equals False
             steps:
-              - ${{ if eq(BuildPlatform.name, 'macOS') }}:
-                - template: agent-cleanser/v1.yml@xamarin-templates
-                  parameters:
-                    UninstallMono: false
-                    UninstallXamarinMac: false
-                    CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
               - template: common/provision.yml
                 parameters:
                   platform: ${{ BuildPlatform.name }}
@@ -226,17 +220,12 @@ stages:
                 - Agent.HasDevices -equals False
                 - Agent.IsPaired -equals False
             steps:
-              - ${{ if eq(BuildPlatform.name, 'macOS') }}:
-                - template: agent-cleanser/v1.yml@xamarin-templates
-                  parameters:
-                    UninstallMono: false
-                    UninstallXamarinMac: false
-                    CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
               - template: common/provision.yml
                 parameters:
                   platform: ${{ BuildPlatform.name }}
                   poolName: ${{ BuildPlatform.poolName }}
                   provisionatorChannel: ${{ parameters.provisionatorChannel }}
+                  
               - task: DownloadBuildArtifacts@0
                 displayName: 'Download Packages'
                 inputs:
@@ -284,12 +273,6 @@ stages:
                   - Agent.HasDevices -equals False
                   - Agent.IsPaired -equals False
               steps:
-                - ${{ if eq(BuildPlatform.name, 'macOS') }}:
-                  - template: agent-cleanser/v1.yml@xamarin-templates
-                    parameters:
-                      UninstallMono: false
-                      UninstallXamarinMac: false
-                      CleanseAgentToolsDotNet: true           # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
                 - template: common/provision.yml
                   parameters:
                     platform: ${{ BuildPlatform.name }}