diff --git a/.github/workflows/server-application.yml b/.github/workflows/server-application.yml
index 9e465f761..f46133f18 100644
--- a/.github/workflows/server-application.yml
+++ b/.github/workflows/server-application.yml
@@ -46,7 +46,7 @@ jobs:
 
     - name: Create Bundle Dir
       id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t \"${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX\")" >> $GITHUB_OUTPUT
+      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
 
     - name: Cache build
       id: cache-build
@@ -81,7 +81,9 @@ jobs:
       id: cache-build
       uses: actions/cache@v3
       with:
-        path: packages/**/dist
+        path: |
+          packages/**/dist
+          ${{ steps.bundle-dir.outputs.temp_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -109,7 +111,9 @@ jobs:
       id: cache-build
       uses: actions/cache@v3
       with:
-        path: packages/**/dist
+        path: |
+          packages/**/dist
+          ${{ steps.bundle-dir.outputs.temp_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -138,7 +142,9 @@ jobs:
       id: cache-build
       uses: actions/cache@v3
       with:
-        path: packages/**/dist
+        path: |
+          packages/**/dist
+          ${{ steps.bundle-dir.outputs.temp_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -205,7 +211,9 @@ jobs:
       id: cache-build
       uses: actions/cache@v3
       with:
-        path: packages/**/dist
+        path: |
+          packages/**/dist
+          ${{ steps.bundle-dir.outputs.temp_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -266,7 +274,9 @@ jobs:
       id: cache-build
       uses: actions/cache@v3
       with:
-        path: packages/**/dist
+        path: |
+          packages/**/dist
+          ${{ steps.bundle-dir.outputs.temp_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node