diff --git a/.github/workflows/run-tests-pro.yaml b/.github/workflows/run-tests-pro.yaml
index 7f6c6c83f..6f7e8e4d3 100644
--- a/.github/workflows/run-tests-pro.yaml
+++ b/.github/workflows/run-tests-pro.yaml
@@ -61,7 +61,7 @@ jobs:
       - name: Copy screenshots
         run: |
           mkdir screenshots
-          cp ../dbgate-merged/e2e-tests/cypress/screenshots/*.png screenshots/
+          cp ../dbgate-merged/e2e-tests/cypress/screenshots/**/*.png screenshots/
       - name: Upload E2E screenshots
         uses: actions/upload-artifact@v4
         with:
diff --git a/e2e-tests/cypress.config.js b/e2e-tests/cypress.config.js
index 74b9fd3f1..8199a25b7 100644
--- a/e2e-tests/cypress.config.js
+++ b/e2e-tests/cypress.config.js
@@ -6,6 +6,8 @@ const { exec } = require('child_process');
 
 module.exports = defineConfig({
   e2e: {
+    trashAssetsBeforeRuns: false,
+    
     setupNodeEvents(on, config) {
       // implement node event listeners here
 
diff --git a/workflow-templates/run-tests-pro.yaml b/workflow-templates/run-tests-pro.yaml
index e16c6906c..f8f4a0891 100644
--- a/workflow-templates/run-tests-pro.yaml
+++ b/workflow-templates/run-tests-pro.yaml
@@ -53,7 +53,7 @@ jobs:
       - name: Copy screenshots
         run: |
           mkdir screenshots
-          cp ../dbgate-merged/e2e-tests/cypress/screenshots/*.png screenshots/
+          cp ../dbgate-merged/e2e-tests/cypress/screenshots/**/*.png screenshots/
 
       - name: Upload E2E screenshots
         uses: actions/upload-artifact@v4