diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 25d8fce9e..a0e3e460a 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -37,6 +37,16 @@ jobs:
       - name: Test ${{ matrix.browser }}
         run: docker compose run e2e --browser ${{ matrix.browser }}
         working-directory: e2e
+      - name: Ensure Artifacts Directory Exists
+        run: mdkir -p ./.artifacts
+      - name: Save ZITADEL Logs
+        if: always()
+        run: docker compose logs zitadel > ../.artifacts/e2e-compose-zitadel.log
+        working-directory: e2e
+      - name: Save Prepare Logs
+        if: always()
+        run: docker compose logs prepare > ../.artifacts/e2e-compose-prepare.log
+        working-directory: e2e
       - name: Archive production tests ${{ matrix.browser }}
         if: always()
         uses: actions/upload-artifact@v2
@@ -46,4 +56,6 @@ jobs:
             e2e/cypress/results
             e2e/cypress/videos
             e2e/cypress/screenshots
+            .artifacts/e2e-compose-zitadel.log
+            .artifacts/e2e-compose-prepare.log
           retention-days: 30
diff --git a/.github/workflows/test-code.yml b/.github/workflows/test-code.yml
index 4ce730f71..53898e7ec 100644
--- a/.github/workflows/test-code.yml
+++ b/.github/workflows/test-code.yml
@@ -50,6 +50,10 @@ jobs:
         if: always()
         run: docker compose logs zitadel > ../.artifacts/e2e-compose-zitadel.log
         working-directory: e2e
+      - name: Save Prepare Logs
+        if: always()
+        run: docker compose logs prepare > ../.artifacts/e2e-compose-prepare.log
+        working-directory: e2e
       - name: Archive Test Results
         if: always()
         uses: actions/upload-artifact@v2
@@ -60,4 +64,5 @@ jobs:
             e2e/cypress/videos
             e2e/cypress/screenshots
             .artifacts/e2e-compose-zitadel.log
+            .artifacts/e2e-compose-prepare.log
           retention-days: 30