diff --git a/.github/actions/download-cache-and-artifacts/action.yml b/.github/actions/download-node-modules-and-artifacts/action.yml
similarity index 100%
rename from .github/actions/download-cache-and-artifacts/action.yml
rename to .github/actions/download-node-modules-and-artifacts/action.yml
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 5652ccf7c6..1c42bd1d6f 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -10,7 +10,7 @@ inputs:
     description: 'enable caching for node modules'
     required: false
     type: boolean
-    default: 'true'    
+    default: 'true'
   act:
     description: 'enable act debug'
     required: false
@@ -28,22 +28,6 @@ runs:
         id: tag-sha
         uses: Alfresco/alfresco-build-tools/.github/actions/git-latest-tag@v1.29.0
 # CACHE
-      - name: Node cache
-        id: node-cache
-        if: ${{ inputs.enable-cache == 'true' }}
-        uses: actions/cache@v3
-        env:
-          cache-name: node-cache
-        with:
-          path: |
-            ~/.npm
-            nxcache
-            dist
-          key: .npm-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}-${{ steps.tag-sha.outputs.tag_sha }}
-          restore-keys: |
-            node-${{ runner.os }}-build-${{ env.cache-name }}-
-            node-${{ runner.os }}-build-
-            node-${{ runner.os }}-
       - name: Node Modules cache
         id: node-modules-cache
         if: ${{ inputs.enable-node-modules-cache == 'true' }}
@@ -53,11 +37,11 @@ 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-${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             node_modules-${{ runner.os }}-build-${{ env.cache-name }}-
             node_modules-${{ runner.os }}-build-
-            node_modules-${{ runner.os }}-            
+            node_modules-${{ runner.os }}-
       - name: pip cache
         uses: actions/cache@v3
         if: ${{ inputs.enable-cache == 'true' }}
diff --git a/.github/actions/upload-cache-and-artifacts/action.yml b/.github/actions/upload-node-modules-and-artifacts/action.yml
similarity index 100%
rename from .github/actions/upload-cache-and-artifacts/action.yml
rename to .github/actions/upload-node-modules-and-artifacts/action.yml
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 56454869ac..bd68af8f06 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -20,7 +20,7 @@ on:
       - master
       - develop-patch*
       - master-patch*
-      
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -150,7 +150,7 @@ jobs:
           nx run cli:bundle
           nx run testing:bundle
       - run: nx print-affected $NX_CALCULATION_FLAGS
-      - uses: ./.github/actions/upload-cache-and-artifacts
+      - uses: ./.github/actions/upload-node-modules-and-artifacts
 
   unit-tests:
     timeout-minutes: 30
@@ -176,7 +176,7 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
       - uses: ./.github/actions/setup
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - name: Run unit tests
         run: |
           /usr/bin/xvfb-run --auto-servernum nx affected:test $NX_CALCULATION_FLAGS --exclude=${{ matrix.unit-tests.exclude }}
@@ -193,7 +193,7 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
       - uses: ./.github/actions/setup
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - run: nx affected --target=lint $NX_CALCULATION_FLAGS
 
   build-libs:
@@ -208,11 +208,11 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all tags and branches
       - uses: ./.github/actions/setup
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - run: nx affected:build $NX_CALCULATION_FLAGS --prod
       - run: nx build demoshell --configuration production
       - run: nx affected --target=build-storybook $NX_CALCULATION_FLAGS --configuration ci
-      - uses: ./.github/actions/upload-cache-and-artifacts
+      - uses: ./.github/actions/upload-node-modules-and-artifacts
 
   e2e-storybook:
     timeout-minutes: 20
@@ -225,13 +225,13 @@ jobs:
         with:
           fetch-depth: 0 # Fetch all history for all
       - uses: ./.github/actions/setup
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - name: Process Cloud Storybook Playwright
         run: |
           npx playwright install chromium
           sudo sysctl -w fs.inotify.max_user_watches=524288
           npx nx affected --target=e2e-playwright $NX_CALCULATION_FLAGS || exit 1
-      - uses: ./.github/actions/upload-cache-and-artifacts
+      - uses: ./.github/actions/upload-node-modules-and-artifacts
 
   e2e:
     timeout-minutes: 90
@@ -364,7 +364,7 @@ jobs:
         with:
           enable-cache: "true"
           enable-node-modules-cache: "true"
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - name: setup chrome
         uses: ./.github/actions/setup-chrome
       - name: e2e
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index af82bd5d78..fa87a68fd3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ env:
 jobs:
   setup:
     timeout-minutes: 20
-    if: github.event.pull_request.merged
+    if: github.event.pull_request.merged || ${{ inputs.dry-run-release }}
     name: "Setup"
     runs-on: ubuntu-22.04
     steps:
@@ -85,12 +85,12 @@ jobs:
           npm ci
           nx run cli:bundle
           nx run testing:bundle
-      - uses: ./.github/actions/upload-cache-and-artifacts
+      - uses: ./.github/actions/upload-node-modules-and-artifacts
 
   release-demoshell:
     needs: [setup]
     timeout-minutes: 15
-    if: github.event.pull_request.merged
+    if: github.event.pull_request.merged || ${{ inputs.dry-run-release }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
@@ -106,7 +106,7 @@ jobs:
         with:
           enable-cache: false
           enable-node-modules-cache: false
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - name: release Demoshell docker
         run: |
           nx build demoshell --configuration production
@@ -116,7 +116,7 @@ jobs:
   release-storybook:
     needs: [setup]
     timeout-minutes: 15
-    if: github.event.pull_request.merged
+    if: github.event.pull_request.merged || ${{ inputs.dry-run-release }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
@@ -133,7 +133,7 @@ jobs:
           enable-cache: false
           enable-node-modules-cache: false
           act: ${{ inputs.dry-run-release }}
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - name: release Storybook docker
         run: |
           nx run stories:build-storybook --configuration ci
@@ -143,7 +143,7 @@ jobs:
   release-npm:
     needs: [setup]
     timeout-minutes: 15
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true || ${{ inputs.dry-run-release }}
     runs-on: ubuntu-22.04
     permissions:
       contents: read
@@ -161,7 +161,7 @@ jobs:
         uses: ./.github/actions/enable-dryrun
         with:
           dry-run-flag: ${{ inputs.dry-run-release }}
-      - uses: ./.github/actions/download-cache-and-artifacts
+      - uses: ./.github/actions/download-node-modules-and-artifacts
       - name: check PR number
         id: action
         uses: kamatama41/get-pr-number-action@v0
@@ -185,7 +185,7 @@ jobs:
   npm-check-bundle:
     needs: [release-npm]
     timeout-minutes: 15
-    if: github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true || ${{ inputs.dry-run-release }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository