diff --git a/.github/actions/invalidate_master_cache/action.yml b/.github/actions/invalidate_master_cache/action.yml
index aa433c53..48f92c98 100644
--- a/.github/actions/invalidate_master_cache/action.yml
+++ b/.github/actions/invalidate_master_cache/action.yml
@@ -8,4 +8,4 @@ runs:
       with:
         path: |-
           node_modules
-        key: ${{ build-master-cache-${{ hashFiles('package-lock.json') }}
+        key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }}
diff --git a/.github/actions/npm_install_from_cache/action.yml b/.github/actions/npm_install_from_cache/action.yml
index 9ce26cb7..4ddfdd64 100644
--- a/.github/actions/npm_install_from_cache/action.yml
+++ b/.github/actions/npm_install_from_cache/action.yml
@@ -7,8 +7,8 @@ runs:
       id: cache-nodemodules
       uses: actions/cache/restore@v3
       with:
-        key: ${{ build-master-cache-${{ hashFiles('package-lock.json') }}
         path: node_modules
+        key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }}
     - name: Install npm dependencies
       if: steps.cache-nodemodules.outputs.cache-hit != 'true'
       run: npm install