diff --git a/.github/workflows/auto-pr-comment.yml b/.github/workflows/auto-pr-comment.yml
index 27b5046..0016fc9 100644
--- a/.github/workflows/auto-pr-comment.yml
+++ b/.github/workflows/auto-pr-comment.yml
@@ -113,7 +113,7 @@ jobs:
         run: echo "url=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT
 
       - name: Check for /create-base-image command
-        uses: actions/github-script@v5
+        uses: actions/github-script@v7
         id: command
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -153,8 +153,6 @@ jobs:
           build: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: ./.github/workflows/actions/e2e-setup
-
       - name: Run All Cypress
         if: steps.command.outputs.result == 'all'
         uses: cypress-io/github-action@v6
diff --git a/.github/workflows/visual-base-file.yml b/.github/workflows/visual-base-file.yml
index efd6b8d..a3d01bb 100644
--- a/.github/workflows/visual-base-file.yml
+++ b/.github/workflows/visual-base-file.yml
@@ -23,8 +23,6 @@ jobs:
           build: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: ./.github/workflows/actions/e2e-setup
-
       - name: Run Cypress
         uses: cypress-io/github-action@v6
         with:
diff --git a/.github/workflows/visual-base.yml b/.github/workflows/visual-base.yml
index 477ae31..8985626 100644
--- a/.github/workflows/visual-base.yml
+++ b/.github/workflows/visual-base.yml
@@ -18,8 +18,6 @@ jobs:
           build: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: ./.github/workflows/actions/e2e-setup
-
       - name: Run Cypress
         uses: cypress-io/github-action@v6
         with:
diff --git a/nx.json b/nx.json
index 4cca968..416ba54 100644
--- a/nx.json
+++ b/nx.json
@@ -11,6 +11,9 @@
       "cache": true,
       "dependsOn": ["^build"]
     },
+    "prepare": {
+      "cache": true
+    },
     "@nx/js:tsc": {
       "cache": true,
       "dependsOn": ["^build"],
diff --git a/packages/brand-icons/project.json b/packages/brand-icons/project.json
index 76f7687..7944358 100644
--- a/packages/brand-icons/project.json
+++ b/packages/brand-icons/project.json
@@ -12,7 +12,7 @@
     },
     "prepare": {
       "executor": "@baloise/ds-nx:build-svg",
-      "outputs": ["{projectRoot}/dist", "{projectRoot}/src/index.ts", "{projectRoot}/src/icons.json"],
+      "outputs": ["{projectRoot}/src/assets", "{projectRoot}/src/index.ts", "{projectRoot}/src/icons.json"],
       "options": {
         "projectName": "{projectName}",
         "projectRoot": "{projectRoot}",
diff --git a/packages/icons/project.json b/packages/icons/project.json
index 1f8903b..ece4837 100644
--- a/packages/icons/project.json
+++ b/packages/icons/project.json
@@ -12,7 +12,7 @@
     },
     "prepare": {
       "executor": "@baloise/ds-nx:build-svg",
-      "outputs": ["{projectRoot}/dist", "{projectRoot}/src/index.ts", "{projectRoot}/src/icons.json"],
+      "outputs": ["{projectRoot}/src/assets", "{projectRoot}/src/index.ts", "{projectRoot}/src/icons.json"],
       "options": {
         "projectName": "{projectName}",
         "projectRoot": "{projectRoot}",
diff --git a/packages/maps/project.json b/packages/maps/project.json
index 52bf091..6ea4fb7 100644
--- a/packages/maps/project.json
+++ b/packages/maps/project.json
@@ -16,7 +16,7 @@
     },
     "prepare": {
       "executor": "@baloise/ds-nx:build-svg",
-      "outputs": ["{projectRoot}/dist", "{projectRoot}/src/lib/markers.ts", "{projectRoot}/src/markers.json"],
+      "outputs": ["{projectRoot}/src/assets", "{projectRoot}/src/lib/markers.ts", "{projectRoot}/src/markers.json"],
       "options": {
         "projectName": "{projectName}",
         "projectRoot": "{projectRoot}",