diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
index 76299f3..49db9c6 100644
--- a/.github/workflows/actionlint.yml
+++ b/.github/workflows/actionlint.yml
@@ -17,6 +17,7 @@ on:
 jobs:
   actionlint:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: read
       actions: read
diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
index 14f0370..011f4c5 100644
--- a/.github/workflows/create-release-pr.yml
+++ b/.github/workflows/create-release-pr.yml
@@ -10,6 +10,7 @@ on:
 jobs:
   create-release-pr:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/metacheck.yml b/.github/workflows/metacheck.yml
index 12615c2..202cfaa 100644
--- a/.github/workflows/metacheck.yml
+++ b/.github/workflows/metacheck.yml
@@ -13,6 +13,7 @@ on:
 jobs:
   meta-check:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: read
       actions: read
diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
index ae714f2..63d806e 100644
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -11,6 +11,7 @@ jobs:
   pr-labeler:
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 83fd3f6..39429bc 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -17,6 +17,7 @@ jobs:
   release-drafter:
     if: github.repository_owner == 'nowsprinting' # Skip on forked repo
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: write
       pull-requests: read
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aa5facf..772b5cc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,6 +14,7 @@ jobs:
   check-bump-version:
     if: github.repository_owner == 'nowsprinting' # Skip on forked repo
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: read
     outputs:
@@ -34,6 +35,7 @@ jobs:
     needs: check-bump-version
     if: ${{ needs.check-bump-version.outputs.new-version }}
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       contents: write
       pull-requests: read
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e156f32..6234901 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,6 +26,7 @@ jobs:
   test:
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets.
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     permissions:
       contents: read
       checks: write
@@ -35,8 +36,9 @@ jobs:
       matrix:
         unityVersion: # Available versions see: https://game.ci/docs/docker/versions
           - 2019.4.40f1
-          - 2022.3.29f1
+          - 2022.3.42f1
           - 2023.2.20f1
+          - 6000.0.20f1
         include:
           - unityVersion: 2019.4.40f1
             octocov: true
@@ -50,9 +52,11 @@ jobs:
       - uses: actions/cache@v4
         with:
           path: ${{ env.CREATED_PROJECT_PATH }}/Library
-          key: Library-${{ matrix.unityVersion }}
+          key: Library-linux-${{ matrix.unityVersion }}-${{ github.ref }}
           restore-keys: |
-            Library-
+            Library-linux-${{ matrix.unityVersion }}
+            Library-linux
+            Library
 
       - name: Get package checkout path
         run: |
@@ -124,6 +128,7 @@ jobs:
     needs: test
     if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets.
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     permissions:
       actions: read