diff --git a/.github/workflows/test.e2e.yml b/.github/workflows/test.e2e.yml
index b4dd49aa..4888ff0a 100644
--- a/.github/workflows/test.e2e.yml
+++ b/.github/workflows/test.e2e.yml
@@ -144,7 +144,7 @@ jobs:
         with:
           name: cypress-test-results-${{ github.run_id }}
           path: |
-            cypress/cypress/results/
+            cypress/results/
             cypress/screenshots/
             cypress/videos/
           retention-days: 7
@@ -174,39 +174,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: cypress-test-results-${{ github.run_id }}
-          path: ./downloaded-reports
-
-      - name: Debug downloaded artifacts
-        run: |
-          echo "=== Downloaded artifact structure ==="
-          find downloaded-reports/ -type f 2>/dev/null || echo "No files found"
-          echo ""
-          echo "=== Looking for JSON files ==="
-          find downloaded-reports/ -name "*.json" 2>/dev/null || echo "No JSON files found"
-
-      - name: Copy reports to expected location
-        run: |
-          # Create the target directory structure in cypress directory
-          mkdir -p cypress/results
-
-          # Copy all files from downloaded artifacts, preserving structure
-          if [ -d "downloaded-reports" ]; then
-            # Find and copy all JSON files regardless of their path in the artifact
-            find downloaded-reports/ -name "*.json" -exec cp {} cypress/results/ \;
-
-            # Copy screenshots if they exist
-            if [ -d "downloaded-reports/screenshots" ]; then
-              cp -r downloaded-reports/screenshots cypress/
-            fi
-
-            # Copy videos if they exist
-            if [ -d "downloaded-reports/videos" ]; then
-              cp -r downloaded-reports/videos cypress/
-            fi
-
-            echo "=== Files copied to cypress/results/ ==="
-            ls -la cypress/results/ || echo "No files in cypress/results/"
-          fi
+          path: ./cypress
 
       - name: Merge test reports
         run: |
diff --git a/cypress/cypress.config.ts b/cypress/cypress.config.ts
index c28ecf56..0164c50c 100644
--- a/cypress/cypress.config.ts
+++ b/cypress/cypress.config.ts
@@ -18,7 +18,7 @@ export default defineConfig({
     reporterOptions: {
       useInlineDiffs: true,
       embeddedScreenshots: true,
-      reportDir: 'cypress/results',
+      reportDir: 'results',
       reportFilename: '[name].html',
       overwrite: false,
       html: true,
diff --git a/cypress/e2e/authentification/login.cy.ts b/cypress/e2e/authentification/login.cy.ts
index 4a688129..e03c0fd5 100644
--- a/cypress/e2e/authentification/login.cy.ts
+++ b/cypress/e2e/authentification/login.cy.ts
@@ -1,11 +1,5 @@
 /// <reference types="cypress" />
 
-Cypress.on('uncaught:exception', (err, _runnable) => {
-  // eslint-disable-next-line no-console
-  console.log('Uncaught exception:', err.message)
-  return false
-})
-
 describe('Utopia Map Login', () => {
   const testData = {
     validUser: {
diff --git a/cypress/e2e/authentification/login.form-elements.cy.ts b/cypress/e2e/authentification/login.form-elements.cy.ts
index d7946b24..af3ab64e 100644
--- a/cypress/e2e/authentification/login.form-elements.cy.ts
+++ b/cypress/e2e/authentification/login.form-elements.cy.ts
@@ -1,11 +1,5 @@
 /// <reference types="cypress" />
 
-Cypress.on('uncaught:exception', (err, _runnable) => {
-  // eslint-disable-next-line no-console
-  console.log('Uncaught exception:', err.message)
-  return false
-})
-
 describe('Utopia Map Login Form Elements', () => {
   // TODO: set this data different
   const _testData = {