diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4070ec7c5..1740c09fe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -329,6 +329,7 @@ jobs:
       - name: backend | docker-compose
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend
       - name: cypress | Fullstack tests
+        id: e2e-tests
         run: |
           yarn install
           yarn run cypress:run --spec $(cypress/parallel-features.sh ${{ matrix.job }} ${{ env.jobs }} )
@@ -336,12 +337,8 @@ jobs:
       # UPLOAD SCREENSHOTS - IF TESTS FAIL #####################################
       ##########################################################################
       - name: Full stack tests | if any test failed, upload screenshots
+        if: ${{ failure() && steps.e2e-tests.conclusion == 'failure' }}
         uses: actions/upload-artifact@v3
         with:
           name: cypress-screenshots
           path: cypress/screenshots/
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: cypress-videos
-          path: cypress/videos/