diff --git a/services/web/cypress.config.ts b/services/web/cypress.config.ts
index de40362395..d44d9dc859 100644
--- a/services/web/cypress.config.ts
+++ b/services/web/cypress.config.ts
@@ -3,7 +3,7 @@ import { webpackConfig } from './cypress/support/webpack.cypress'
 
 export default defineConfig({
   fixturesFolder: 'cypress/fixtures',
-  video: !!process.env.CI,
+  video: process.env.CYPRESS_VIDEO === 'true',
   screenshotsFolder: 'cypress/results',
   videosFolder: 'cypress/results',
   viewportHeight: 800,
diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml
index 6c5f5d861c..2ac6607a1f 100644
--- a/services/web/docker-compose.ci.yml
+++ b/services/web/docker-compose.ci.yml
@@ -56,16 +56,16 @@ services:
   test_frontend_ct:
     image: $CYPRESS_IMAGE
     working_dir: /overleaf/services/web
-    entrypoint: bash
     environment:
       CYPRESS_SPEC_PATTERN: ${CYPRESS_SPEC_PATTERN:-}
       CYPRESS_EXCLUDE_SPEC_PATTERN: ${CYPRESS_EXCLUDE_SPEC_PATTERN:-}
     volumes:
       - ${CYPRESS_RESULTS:-./cypress/results}:/overleaf/services/web/cypress/results/
       - /dev/shm/overleaf:/overleaf
+    entrypoint: npm
     command:
-      - "-c"
-      - "if npm run cypress:run-ct; then exit 0; else mkdir -p ./cypress/results && touch ./cypress/results/.cypress_fail; fi;"
+      - "run"
+      - "cypress:run-ct"
 
   tar:
     image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER-webpack