diff --git a/Composer/scripts/e2e.sh b/Composer/scripts/e2e.sh
index 2b9ccc2c27..148fac5b2e 100755
--- a/Composer/scripts/e2e.sh
+++ b/Composer/scripts/e2e.sh
@@ -5,7 +5,7 @@ set -e
 yarn start &
 SERVER_PID=$!
 
-npx cypress run --browser chrome --record --parallel --ci-build-id $BUILD_BUILDNUMBER --group "Azure CI"
+npx cypress run --browser chrome
 cleanup
 
 function cleanup {
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 25b9d4f8cc..5cbf7b7cae 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,8 +13,9 @@ variables:
 jobs:
   - job: e2e
     displayName: End-to-End Tests
-    strategy:
-      parallel: 4
+    # re-enable once we upgrade our subscription to cypress
+    # strategy:
+    #   parallel: 4
     pool:
       vmImage: ubuntu-latest
 
@@ -46,7 +47,15 @@ jobs:
         workingDirectory: Composer
         continueOnError: true
         env:
-          CYPRESS_RECORD_KEY: $(CYPRESS_RECORD_KEY)
+          # CYPRESS_RECORD_KEY: $(CYPRESS_RECORD_KEY)
           CYPRESS_VIDEO: true
-          CYPRESS_VIDEO_UPLOAD_ON_PASSES: true
+          # CYPRESS_VIDEO_UPLOAD_ON_PASSES: true
+          CYPRESS_SCREENSHOTS_FOLDER: $(Build.ArtifactStagingDirectory)/cypress/screenshots
+          CYPRESS_VIDEOS_FOLDER: $(Build.ArtifactStagingDirectory)/cypress/videos
           TERM: xterm
+      - task: PublishPipelineArtifact@1
+        condition: in(variables['Agent.JobStatus'], 'SucceededWithIssues', 'Failed')
+        continueOnError: true
+        inputs:
+          targetPath: $(Build.ArtifactStagingDirectory)/cypress
+          artifactName: e2e