diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
index bd2f4d24cd..373b0a69ad 100644
--- a/.github/workflows/code-coverage.yml
+++ b/.github/workflows/code-coverage.yml
@@ -37,10 +37,9 @@ jobs:
         uses: "actions/cache@v3"
         with:
           path: "${{ steps.composer-cache.outputs.directory }}"
-          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
+          key: "composer-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-
-            composer-${{ runner.os }}-
+            composer-${{ matrix.php-version }}-
             composer-
 
       - name: "Download dependencies"
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 38e6da99e5..9241af8c7c 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -37,10 +37,9 @@ jobs:
         uses: "actions/cache@v3"
         with:
           path: "${{ steps.composer-cache.outputs.directory }}"
-          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
+          key: "composer-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-
-            composer-${{ runner.os }}-
+            composer-${{ matrix.php-version }}-
             composer-
 
       - name: "Download dependencies"
@@ -52,11 +51,10 @@ jobs:
         uses: "actions/cache@v3"
         with:
           path: ".php_cs.cache"
-          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ github.ref_name }}"
+          key: "composer-${{ matrix.php-version }}-${{ github.ref_name }}"
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-main
-            composer-${{ runner.os }}-${{ matrix.php-version }}
-            composer-${{ runner.os }}-
+            composer-${{ matrix.php-version }}-main
+            composer-${{ matrix.php-version }}
             composer-
 
       - name: "Run php-cs-fixer"
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index ddc9730067..d48102ac20 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -35,10 +35,9 @@ jobs:
         uses: "actions/cache@v3"
         with:
           path: "${{ steps.composer-cache.outputs.directory }}"
-          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
+          key: "composer-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-
-            composer-${{ runner.os }}-
+            composer-${{ matrix.php-version }}-
             composer-
 
       - name: "Download dependencies"
@@ -77,10 +76,9 @@ jobs:
         uses: "actions/cache@v3"
         with:
           path: "${{ steps.composer-cache.outputs.directory }}"
-          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
+          key: "composer-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-
-            composer-${{ runner.os }}-
+            composer-${{ matrix.php-version }}-
             composer-
 
       - name: "Download dependencies"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0731b36c8d..633a14943c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,18 +11,16 @@ name: "Tests"
 
 jobs:
   phpunit:
-    name: "PHPUnit on ${{ matrix.operating-system }} with PHP ${{ matrix.php-version }}"
+    name: "PHPUnit"
 
     strategy:
       matrix:
-        operating-system:
-          - "ubuntu-latest"
         php-version:
           - "7.4"
           - "8.0"
           - "8.1"
 
-    runs-on: "${{ matrix.operating-system }}"
+    runs-on: "ubuntu-latest"
 
     steps:
       - name: "Checkout code"
@@ -43,10 +41,9 @@ jobs:
         uses: "actions/cache@v3"
         with:
           path: "${{ steps.composer-cache.outputs.directory }}"
-          key: "composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
+          key: "composer-${{ matrix.php-version }}-${{ hashFiles('composer.*') }}"
           restore-keys: |
-            composer-${{ runner.os }}-${{ matrix.php-version }}-
-            composer-${{ runner.os }}-
+            composer-${{ matrix.php-version }}-
             composer-
 
       - name: "Download dependencies"