diff --git a/tools/devops/cleanup.sh b/tools/devops/cleanup.sh
new file mode 100755
index 0000000000..090302f67b
--- /dev/null
+++ b/tools/devops/cleanup.sh
@@ -0,0 +1,6 @@
+sudo rm -rf /Applications/Visual\ Studio*
+rm -rf ~/Library/Caches/VisualStudio
+rm -rf ~/Library/Logs/VisualStudio
+rm -rf ~/Library/VisualStudio
+rm -rf ~/Library/Preferences/Xamarin/
+rm -rf ~/Library/Caches/com.xamarin.provisionator
\ No newline at end of file
diff --git a/tools/devops/device-tests.yml b/tools/devops/device-tests.yml
index 4f4d5dca38..d455f9b9c0 100644
--- a/tools/devops/device-tests.yml
+++ b/tools/devops/device-tests.yml
@@ -141,3 +141,12 @@ jobs:
       artifactName: HtmlReport
     continueOnError: true
     condition: succeededOrFailed()
+
+###
+### Cleanup after us, not having that can lead to VSMac install issues
+###
+
+  - bash: ./xamarin-macios/tools/devops/cleanup.sh
+    displayName: 'Cleanup'
+    continueOnError: true
+    condition: succeededOrFailed()