diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7bd31d34f..18379da21 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -175,8 +175,10 @@ jobs:
         if: ${{ matrix.app.canary }}
         run: |
           cat packages/next/package.json | jq '.dependencies.next|="canary"' > packages/next/package.json.new && mv packages/next/package.json.new packages/next/package.json
-          cat workbench/${{ matrix.app.name }}/package.json | jq '.dependencies.next|="canary"' > workbench/${{ matrix.app.name }}/package.json.new && mv workbench/${{ matrix.app.name }}/package.json.new workbench/${{ matrix.app.name }}/package.json
+          cat "workbench/${APP_NAME}/package.json" | jq '.dependencies.next|="canary"' > "workbench/${APP_NAME}/package.json.new" && mv "workbench/${APP_NAME}/package.json.new" "workbench/${APP_NAME}/package.json"
           pnpm install --no-frozen-lockfile
+        env:
+          APP_NAME: ${{ matrix.app.name }}
 
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
@@ -185,10 +187,12 @@ jobs:
         run: pnpm turbo run build --filter='!./workbench/*'
 
       - name: Resolve symlinks
-        run: ./scripts/resolve-symlinks.sh workbench/${{ matrix.app.name }}
+        run: ./scripts/resolve-symlinks.sh "workbench/${APP_NAME}"
+        env:
+          APP_NAME: ${{ matrix.app.name }}
 
       - name: Run E2E Tests
-        run: cd workbench/${{ matrix.app.name }} && pnpm dev & echo "starting tests in 10 seconds" && sleep 10 && pnpm vitest run packages/core/e2e/dev.test.ts && sleep 10 && pnpm run test:e2e
+        run: cd "workbench/${APP_NAME}" && pnpm dev & echo "starting tests in 10 seconds" && sleep 10 && pnpm vitest run packages/core/e2e/dev.test.ts && sleep 10 && pnpm run test:e2e
         env:
           APP_NAME: ${{ matrix.app.name }}
           DEPLOYMENT_URL: "http://localhost:${{ matrix.app.name == 'sveltekit' && '5173' || '3000' }}"
@@ -225,8 +229,10 @@ jobs:
         if: ${{ matrix.app.canary }}
         run: |
           cat packages/next/package.json | jq '.dependencies.next|="canary"' > packages/next/package.json.new && mv packages/next/package.json.new packages/next/package.json
-          cat workbench/${{ matrix.app.name }}/package.json | jq '.dependencies.next|="canary"' > workbench/${{ matrix.app.name }}/package.json.new && mv workbench/${{ matrix.app.name }}/package.json.new workbench/${{ matrix.app.name }}/package.json
+          cat "workbench/${APP_NAME}/package.json" | jq '.dependencies.next|="canary"' > "workbench/${APP_NAME}/package.json.new" && mv "workbench/${APP_NAME}/package.json.new" "workbench/${APP_NAME}/package.json"
           pnpm install --no-frozen-lockfile
+        env:
+          APP_NAME: ${{ matrix.app.name }}
 
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
@@ -240,7 +246,7 @@ jobs:
           APP_NAME: ${{ matrix.app.name }}
 
       - name: Run E2E Tests
-        run: cd workbench/${{ matrix.app.name }} && pnpm start & echo "starting tests in 10 seconds" && sleep 10 && pnpm run test:e2e
+        run: cd "workbench/${APP_NAME}" && pnpm start & echo "starting tests in 10 seconds" && sleep 10 && pnpm run test:e2e
         env:
           APP_NAME: ${{ matrix.app.name }}
           DEPLOYMENT_URL: "http://localhost:${{ matrix.app.name == 'sveltekit' && '4173' || '3000' }}"
@@ -293,8 +299,10 @@ jobs:
         if: ${{ matrix.app.canary }}
         run: |
           cat packages/next/package.json | jq '.dependencies.next|="canary"' > packages/next/package.json.new && mv packages/next/package.json.new packages/next/package.json
-          cat workbench/${{ matrix.app.name }}/package.json | jq '.dependencies.next|="canary"' > workbench/${{ matrix.app.name }}/package.json.new && mv workbench/${{ matrix.app.name }}/package.json.new workbench/${{ matrix.app.name }}/package.json
+          cat "workbench/${APP_NAME}/package.json" | jq '.dependencies.next|="canary"' > "workbench/${APP_NAME}/package.json.new" && mv "workbench/${APP_NAME}/package.json.new" "workbench/${APP_NAME}/package.json"
           pnpm install --no-frozen-lockfile
+        env:
+          APP_NAME: ${{ matrix.app.name }}
 
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
@@ -311,7 +319,7 @@ jobs:
           APP_NAME: ${{ matrix.app.name }}
 
       - name: Run E2E Tests
-        run: cd workbench/${{ matrix.app.name }} && pnpm start & echo "starting tests in 10 seconds" && sleep 10 && pnpm run test:e2e
+        run: cd "workbench/${APP_NAME}" && pnpm start & echo "starting tests in 10 seconds" && sleep 10 && pnpm run test:e2e
         env:
           APP_NAME: ${{ matrix.app.name }}
           DEPLOYMENT_URL: "http://localhost:${{ matrix.app.name == 'sveltekit' && '4173' || '3000' }}"