diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml
index 5f405418..52b894d7 100644
--- a/.github/workflows/build-tests.yml
+++ b/.github/workflows/build-tests.yml
@@ -46,7 +46,6 @@ jobs:
         projectPath:
           - test-project
         unityVersion:
-          - 2018.2.21f1
           - 2018.3.14f1
           - 2018.4.36f1
           - 2019.1.14f1
@@ -62,9 +61,9 @@ jobs:
           - 2022.1.24f1
           - 2022.2.6f1
         targetPlatform:
-          - StandaloneOSX # Build a macOS standalone (Intel 64-bit).
-          - StandaloneWindows64 # Build a Windows 64-bit standalone.
-          - StandaloneLinux64 # Build a Linux 64-bit standalone.
+          - StandaloneOSX # Build a macOS standalone (Intel 64-bit) with mono backend.
+          - StandaloneWindows64 # Build a Windows 64-bit standalone with mono backend.
+          - StandaloneLinux64 # Build a Linux 64-bit standalone with mono backend.
           - iOS # Build an iOS player.
           - Android # Build an Android .apk.
           - WebGL # WebGL.
diff --git a/.github/workflows/mac-build-tests.yml b/.github/workflows/mac-build-tests.yml
index bcb39311..05d5c43c 100644
--- a/.github/workflows/mac-build-tests.yml
+++ b/.github/workflows/mac-build-tests.yml
@@ -42,7 +42,7 @@ jobs:
         projectPath:
           - test-project
         unityVersion:
-          - 2019.4.40f1
+          - 2019.4.40f1 # Minimum version for IL2CPP
           - 2020.1.17f1
           - 2020.2.7f1
           - 2020.3.44f1
diff --git a/.github/workflows/windows-build-tests.yml b/.github/workflows/windows-build-tests.yml
index 09096b5f..97f74b88 100644
--- a/.github/workflows/windows-build-tests.yml
+++ b/.github/workflows/windows-build-tests.yml
@@ -42,14 +42,12 @@ jobs:
         projectPath:
           - test-project
         unityVersion:
-          - 2019.3.15f1
+          - 2019.3.15f1 # Minimum version for IL2CPP
           - 2019.4.40f1
           - 2020.1.17f1
           - 2020.2.7f1
           - 2020.3.44f1
-          - 2021.1.28f1
-          - 2021.2.19f1
-          - 2021.3.18f1
+          - 2021.3.18f1 # 2021.1 and 2021.2 seem to have IL2CPP issues
           - 2022.1.24f1
           - 2022.2.6f1
         targetPlatform:
@@ -88,6 +86,47 @@ jobs:
       #          Build          #
       ###########################
       - uses: ./
+        id: build-1
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+        with:
+          projectPath: ${{ matrix.projectPath }}
+          unityVersion: ${{ matrix.unityVersion }}
+          targetPlatform: ${{ matrix.targetPlatform }}
+          customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
+          allowDirtyBuild: true
+      # We use dirty build because we are replacing the default project settings file above
+
+      - name: Sleep for Retry
+        if: ${{ steps.build-1.outcome == 'failure' }}
+        run: |
+          Start-Sleep -s 120
+
+      - uses: ./
+        id: build-2
+        if: steps.build-1.outcome == 'failure'
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+        with:
+          projectPath: ${{ matrix.projectPath }}
+          unityVersion: ${{ matrix.unityVersion }}
+          targetPlatform: ${{ matrix.targetPlatform }}
+          customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
+          allowDirtyBuild: true
+      # We use dirty build because we are replacing the default project settings file above
+
+      - name: Sleep for Retry
+        if: ${{ steps.build-1.outcome == 'failure' && steps.build-2.outcome == 'failure' }}
+        run: |
+          Start-Sleep -s 240
+
+      - uses: ./
+        id: build-3
+        if: ${{ steps.build-1.outcome == 'failure' && steps.build-2.outcome == 'failure' }}
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
diff --git a/test-project/ProjectSettings/ProjectSettings.asset b/test-project/ProjectSettings/ProjectSettings.asset
index 86baf327..7b66fd1f 100644
--- a/test-project/ProjectSettings/ProjectSettings.asset
+++ b/test-project/ProjectSettings/ProjectSettings.asset
@@ -165,7 +165,7 @@ PlayerSettings:
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Standalone: com.Company.ProductName
-    Android: com.Company.ProductName
+    Android: com.DefaultCompany.simpletestproject
   buildNumber: {}
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 16
diff --git a/test-project/ProjectSettings/ProjectSettingsIl2cpp.asset b/test-project/ProjectSettings/ProjectSettingsIl2cpp.asset
index afd359b4..81fa1255 100644
--- a/test-project/ProjectSettings/ProjectSettingsIl2cpp.asset
+++ b/test-project/ProjectSettings/ProjectSettingsIl2cpp.asset
@@ -154,7 +154,7 @@ PlayerSettings:
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Standalone: com.Company.ProductName
-	Android: com.Company.ProductName
+	Android: com.DefaultCompany.simpletestproject
   buildNumber:
     Standalone: 0
     iPhone: 0