diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 65fed6e400..cf9f8dfa48 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,13 +78,23 @@ jobs:
         make
 
     - name: Run E2E Tests
+      id: e2e
       run: |
         .github/scripts/check-infra-dependencies.sh all
         make e2e-reset-db
         make e2e-serve-${{ matrix.fleet-tier }} &
         sleep 3
         make e2e-setup
-        yarn cypress run --config-file cypress-${{ matrix.fleet-tier }}.json --config video=false
+        yarn cypress run --config-file cypress-${{ matrix.fleet-tier }}.json
+
+    - name: Upload artifacts
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        name: cypress
+        path: |
+          cypress/screenshots/
+          cypress/videos/
 
 
   test-js:
diff --git a/cypress-free.json b/cypress-free.json
index 91f97117f0..0d67988841 100644
--- a/cypress-free.json
+++ b/cypress-free.json
@@ -5,5 +5,6 @@
   "retries": {
     "runMode": 1,
     "openMode": 0
-  }
+  },
+  "videoUploadOnPasses": false
 }
diff --git a/cypress-premium.json b/cypress-premium.json
index 394960d126..6f02b6862e 100644
--- a/cypress-premium.json
+++ b/cypress-premium.json
@@ -5,5 +5,6 @@
   "retries": {
     "runMode": 1,
     "openMode": 0
-  }
+  },
+  "videoUploadOnPasses": false
 }
diff --git a/cypress.json b/cypress.json
index 17a50beb32..027d143194 100644
--- a/cypress.json
+++ b/cypress.json
@@ -6,6 +6,6 @@
   "retries": {
     "runMode": 1,
     "openMode": 0
-  }
+  },
+  "videoUploadOnPasses": false
 }
-