diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 65c7f4fa..2eea327a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -474,7 +474,6 @@ jobs:
         targetPlatform:
           - StandaloneWindows
           - StandaloneWindows64
-    timeout-minutes: 90
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -503,11 +502,44 @@ jobs:
             Library-buildWindows-
       - name: Build Unity Project
         id: build
+        continue-on-error: true
+        timeout-minutes: 45
         uses: game-ci/unity-builder@main
         env:
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL_PERSONAL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD_PERSONAL }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL_PERSONAL }}
+        with:
+          targetPlatform: ${{ matrix.targetPlatform }}
+          buildMethod: Cgs.Editor.BuildCgs.BuildOptions
+      - name: Sleep for Retry
+        if: ${{ steps.build.outcome == 'failure' }}
+        run: Start-Sleep -s 120
+      - name: Build Retry
+        id: build-2
+        continue-on-error: true
+        timeout-minutes: 45
+        if: steps.build.outcome == 'failure'
+        uses: game-ci/unity-builder@main
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL_PERSONAL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD_PERSONAL }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL_PERSONAL }}
+        with:
+          targetPlatform: ${{ matrix.targetPlatform }}
+          buildMethod: Cgs.Editor.BuildCgs.BuildOptions
+      - name: Sleep for Retry 2
+        if: ${{ steps.build.outcome == 'failure' && steps.build-2.outcome == 'failure' }}
+        run: Start-Sleep -s 240
+      - name: Build Retry 2
+        id: build-3
+        timeout-minutes: 45
+        if: ${{ steps.build.outcome == 'failure' && steps.build-2.outcome == 'failure' }}
+        uses: game-ci/unity-builder@main
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL_PERSONAL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD_PERSONAL }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL_PERSONAL }}
         with:
           targetPlatform: ${{ matrix.targetPlatform }}
           buildMethod: Cgs.Editor.BuildCgs.BuildOptions
@@ -559,11 +591,44 @@ jobs:
           git reset --hard
       - name: Build Unity Project
         id: build
-        uses: game-ci/unity-builder@v3
+        continue-on-error: true
+        timeout-minutes: 45
+        uses: game-ci/unity-builder@main
         env:
-          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL_PERSONAL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD_PERSONAL }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL_PERSONAL }}
+        with:
+          targetPlatform: WSAPlayer
+          buildMethod: Cgs.Editor.BuildCgs.BuildOptions
+      - name: Sleep for Retry
+        if: ${{ steps.build.outcome == 'failure' }}
+        run: Start-Sleep -s 120
+      - name: Build Retry
+        id: build-2
+        continue-on-error: true
+        timeout-minutes: 45
+        if: steps.build.outcome == 'failure'
+        uses: game-ci/unity-builder@main
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL_PERSONAL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD_PERSONAL }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL_PERSONAL }}
+        with:
+          targetPlatform: WSAPlayer
+          buildMethod: Cgs.Editor.BuildCgs.BuildOptions
+      - name: Sleep for Retry 2
+        if: ${{ steps.build.outcome == 'failure' && steps.build-2.outcome == 'failure' }}
+        run: Start-Sleep -s 240
+      - name: Build Retry 2
+        id: build-3
+        timeout-minutes: 45
+        if: ${{ steps.build.outcome == 'failure' && steps.build-2.outcome == 'failure' }}
+        uses: game-ci/unity-builder@main
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL_PERSONAL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD_PERSONAL }}
+          UNITY_SERIAL: ${{ secrets.UNITY_SERIAL_PERSONAL }}
         with:
           targetPlatform: WSAPlayer
           buildMethod: Cgs.Editor.BuildCgs.BuildOptions