diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
index 0e05f64c76..fed8f58441 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/merge-main.yml
@@ -96,6 +96,14 @@ jobs:
           sonar_token: ${{ secrets.SONAR_TOKEN_FRONTEND }}
           triggers: ('frontend/')
 
+      - uses: actions/upload-artifact@v4
+        name: Upload Cypress Screenshots with error
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: frontend/cypress/screenshots
+          retention-days: 7
+
   codeql:
     name: Semantic Code Analysis
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 3436bc450c..bc9b349997 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -165,6 +165,14 @@ jobs:
           delete-old-comments: true
           github-token: ${{ github.token }}
           lcov-file: ./frontend/reports/e2e/lcov.info
+
+      - uses: actions/upload-artifact@v4
+        name: Upload Cypress Screenshots with error
+        if: failure()
+        with:
+          name: cypress-screenshots
+          path: frontend/cypress/screenshots
+          retention-days: 7
   
   trivy:
     name: Repository Report