diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index fda74ba2bd..8e13c51791 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -37,11 +37,11 @@ runs:
         with:
           path: |
             nxcache
-          key: nxcache-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}-${{ steps.tag-sha.outputs.tag_sha }}
+          key: nxcache-${{ env.GITHUB_REF_NAME }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}-${{ steps.tag-sha.outputs.tag_sha }}
           restore-keys: |
-            nxcache-${{ runner.os }}-build-${{ env.cache-name }}-
-            nxcache-${{ runner.os }}-build-
-            nxcache-${{ runner.os }}-
+            nxcache-${{ env.GITHUB_REF_NAME }}-build-${{ env.cache-name }}-
+            nxcache-${{ env.GITHUB_REF_NAME }}-build-
+            nxcache-${{ env.GITHUB_REF_NAME }}-
       - name: Node Modules cache
         id: node-modules-cache
         if: ${{ inputs.enable-node-modules-cache == 'true' }}
@@ -51,19 +51,19 @@ runs:
         with:
           path: |
             node_modules
-          key: .npm-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}-${{ steps.tag-sha.outputs.tag_sha }}
+          key: .npm-${{ env.GITHUB_REF_NAME }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}-${{ steps.tag-sha.outputs.tag_sha }}
           restore-keys: |
-            node_modules-${{ runner.os }}-build-${{ env.cache-name }}-
-            node_modules-${{ runner.os }}-build-
-            node_modules-${{ runner.os }}-            
+            node_modules-${{ env.GITHUB_REF_NAME }}-build-${{ env.cache-name }}-
+            node_modules-${{ env.GITHUB_REF_NAME }}-build-
+            node_modules-${{ env.GITHUB_REF_NAME }}-            
       - name: pip cache
         uses: actions/cache@v3
         if: ${{ inputs.enable-cache == 'true' }}
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-
+          key: ${{ env.GITHUB_REF_NAME }}-pip-
           restore-keys: |
-            ${{ runner.os }}
+            ${{ env.GITHUB_REF_NAME }}
 # ENV LOAD
       - name: load .travis.yml env.global variables
         uses: Alfresco/alfresco-build-tools/.github/actions/travis-env-load@v1.17.0
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 810f5faf51..cb6e0d19e7 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -119,8 +119,8 @@ jobs:
           fetch-depth: 0 # Fetch all history for all tags and branches
       - uses: ./.github/actions/setup
         with: 
-          enable-cache: false
-          enable-node-modules-cache: false
+          enable-cache: true
+          enable-node-modules-cache: true
       - run: npm ci
       - run: nx run cli:bundle
       - run: nx run testing:bundle