diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5797ced..3e4d845 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,39 +12,26 @@ env:
   PROJECT_PATH: .
 
 jobs:
-  checklicense:
-    name: check if UNITY_LICENSE is set in github secrets
-    runs-on: ubuntu-latest
-    outputs:
-      is_unity_license_set: ${{ steps.checklicense_job.outputs.is_unity_license_set }}
-    steps:
-      - name: Check whether unity activation requests should be done
-        id: checklicense_job
-        run: |
-            echo "Skip activation job: ${{ env.UNITY_LICENSE != '' }}"
-            echo "::set-output name=is_unity_license_set::${{ env.UNITY_LICENSE != '' }}"
+### See https://game.ci/docs/github/getting-started
   activation:
-    needs: [checklicense]
-    if: needs.checklicense.outputs.is_unity_license_set == 'false'
-    name: Request activation file 🔑
+    if: ${{ env.UNITY_LICENSE == '' }}
+    name: Request manual activation file 🔑
     runs-on: ubuntu-latest
     steps:
       # Request manual activation file
       - name: Request manual activation file
         id: getManualLicenseFile
-        # https://github.com/game-ci/unity-request-activation-file/releases/
         uses: game-ci/unity-request-activation-file@v2
       # Upload artifact (Unity_v20XX.X.XXXX.alf)
       - name: Expose as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.getManualLicenseFile.outputs.filePath }}
           path: ${{ steps.getManualLicenseFile.outputs.filePath }}
 
   test:
-    needs: [checklicense]
-    if: needs.checklicense.outputs.is_unity_license_set == 'true'
-    name: Test all modes ✨
+    if: ${{ env.UNITY_LICENSE != '' }}
+    name: Run all tests ✨
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -52,26 +39,20 @@ jobs:
           lfs: true
       - uses: actions/cache@v3
         with:
-          path: Library
-          key: Library-test-project-${{ matrix.targetPlatform }}
-          restore-keys: |
-            Library-test-project-
-            Library-
-      # https://github.com/game-ci/unity-test-runner/releases/
+          path: ${{ env.projectPath }}/Library
+          key: Library-test
       - uses: game-ci/unity-test-runner@v2
         id: testRunner
         with:
           projectPath: ${{ env.PROJECT_PATH }}
-          testMode: all
-          customParameters: "-nographics"
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/upload-artifact@v3
         with:
           name: Test results (all modes)
           path: ${{ steps.testRunner.outputs.artifactsPath }}
 
   build:
-    needs: [checklicense]
-    if: needs.checklicense.outputs.is_unity_license_set == 'true'
+    needs: [test]
     name: Build for ${{ matrix.targetPlatform }}
     runs-on: ubuntu-latest
     strategy:
@@ -88,12 +69,8 @@ jobs:
           lfs: true
       - uses: actions/cache@v3
         with:
-          path: ${{ matrix.projectPath }}/Library
-          key: Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}
-          restore-keys: |
-            Library-${{ matrix.projectPath }}-
-            Library-
-      # https://github.com/game-ci/unity-builder/releases/
+          path: ${{ env.projectPath }}/Library
+          key: Library-${{ matrix.targetPlatform }}
       - uses: game-ci/unity-builder@v2
         with:
           projectPath: ${{ env.PROJECT_PATH }}
@@ -101,11 +78,10 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: Build-${{ matrix.targetPlatform }}
-          path: build
+          path: ${{ env.PROJECT_PATH }}/build
 
   buildWithMac:
-    needs: [checklicense]
-    if: needs.checklicense.outputs.is_unity_license_set == 'true'
+    needs: [build]
     name: Build for ${{ matrix.targetPlatform }}
     runs-on: macos-latest
     strategy:
@@ -114,30 +90,24 @@ jobs:
         targetPlatform:
           - StandaloneOSX
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
         with:
           lfs: true
       - uses: actions/cache@v3
         with:
           path: ${{ matrix.projectPath }}/Library
-          key: Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}
-          restore-keys: |
-            Library-${{ matrix.projectPath }}-
-            Library-
+          key: Library-${{ matrix.targetPlatform }}
       - uses: game-ci/unity-builder@v2
         with:
           projectPath: ${{ env.PROJECT_PATH }}
           targetPlatform: ${{ matrix.targetPlatform }}
-      - name: Upload Build
-        uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v3
         with:
           name: Build-${{ matrix.targetPlatform }}
-          path: build
+          path: ${{ env.PROJECT_PATH }}/build
 
   buildWithWindows:
-    needs: [build, buildWithMac]
-    if: needs.checklicense.outputs.is_unity_license_set == 'true'
+    needs: [buildWithMac]
     name: Build for ${{ matrix.targetPlatform }}
     runs-on: windows-2019
     strategy:
@@ -148,23 +118,18 @@ jobs:
           - StandaloneWindows64
           - WSAPlayer
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
         with:
           lfs: true
       - uses: actions/cache@v3
         with:
-          path: ${{ matrix.projectPath }}/Library
-          key: Library-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}
-          restore-keys: |
-            Library-${{ matrix.projectPath }}-
-            Library-
+          path: ${{ env.projectPath }}/Library
+          key: Library-${{ matrix.targetPlatform }}
       - uses: game-ci/unity-builder@v2
         with:
           projectPath: ${{ env.PROJECT_PATH }}
           targetPlatform: ${{ matrix.targetPlatform }}
-      - name: Upload Build
-        uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v3
         with:
           name: Build-${{ matrix.targetPlatform }}
-          path: build
+          path: ${{ env.PROJECT_PATH }}/build