diff --git a/.github/workflows/build-enjoy-app-linux.yml b/.github/workflows/build-enjoy-app-linux.yml
index 88721826..cd97a30a 100644
--- a/.github/workflows/build-enjoy-app-linux.yml
+++ b/.github/workflows/build-enjoy-app-linux.yml
@@ -16,7 +16,7 @@ jobs:
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          key: ubuntu-latest-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn install
diff --git a/.github/workflows/build-enjoy-app-macos12.yml b/.github/workflows/build-enjoy-app-macos12.yml
index fdec32cc..5e9fb78e 100644
--- a/.github/workflows/build-enjoy-app-macos12.yml
+++ b/.github/workflows/build-enjoy-app-macos12.yml
@@ -16,7 +16,7 @@ jobs:
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          key: macos-12-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn install
diff --git a/.github/workflows/build-enjoy-app-macos14.yml b/.github/workflows/build-enjoy-app-macos14.yml
index fb2a8ee2..20bfaf1e 100644
--- a/.github/workflows/build-enjoy-app-macos14.yml
+++ b/.github/workflows/build-enjoy-app-macos14.yml
@@ -16,7 +16,7 @@ jobs:
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          key: macos-14-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn install
diff --git a/.github/workflows/build-enjoy-app-windows.yml b/.github/workflows/build-enjoy-app-windows.yml
index 72acc16c..b9dfc93b 100644
--- a/.github/workflows/build-enjoy-app-windows.yml
+++ b/.github/workflows/build-enjoy-app-windows.yml
@@ -16,7 +16,7 @@ jobs:
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: "**/node_modules"
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          key: windows-latest-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn install
diff --git a/.github/workflows/test-enjoy-app.yml b/.github/workflows/test-enjoy-app.yml
index 88a35156..2d55910f 100644
--- a/.github/workflows/test-enjoy-app.yml
+++ b/.github/workflows/test-enjoy-app.yml
@@ -28,7 +28,7 @@ jobs:
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: "**/node_modules"
-          key: ${{ github.event.inputs.os }}-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ matrix.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         run: yarn install