diff --git a/.env.ci b/.env.ci
index 7d8add3ccf..e93b51fcab 100644
--- a/.env.ci
+++ b/.env.ci
@@ -1 +1,2 @@
-USER_ID=1001
\ No newline at end of file
+USER_ID=1001
+XDEBUG_MODE=off
\ No newline at end of file
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 06e1158ff6..6d0d799732 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -319,7 +319,7 @@ jobs:
     name: "Tests: End-to-end"
     runs-on: ubuntu-latest
     env:
-      CI: 'true'
+      CI: 1
     steps:
 
       - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3
@@ -383,7 +383,7 @@ jobs:
     name: "Tests: End-to-end for development setup"
     runs-on: ubuntu-latest
     env:
-      CI: 'false'
+      CI: 0
     steps:
 
       - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3
diff --git a/docker-compose.yml b/docker-compose.yml
index b668ae5507..39b2fbf3d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -49,11 +49,10 @@ services:
       # See https://github.com/docker/for-linux/issues/264
       # The `remote_host` below may optionally be replaced with `remote_connect_back`
       # XDEBUG_MODE required for step debugging
-      XDEBUG_MODE: develop,debug,coverage
+      XDEBUG_MODE: ${XDEBUG_MODE}
       # default port for Xdebug 3 is 9003
       # idekey=VSCODE if you are debugging with VSCode
-      XDEBUG_CONFIG: >-
-        client_host=docker-host idekey=PHPSTORM
+      XDEBUG_CONFIG: ${XDEBUG_CONFIG}
       # This should correspond to the server declared in PHPStorm `Preferences | Languages & Frameworks | PHP | Servers`
       # Then PHPStorm will use the corresponding path mappings
       PHP_IDE_CONFIG: serverName=localhost
diff --git a/frontend/docker-setup.sh b/frontend/docker-setup.sh
index 4909bad6ea..9fef9d4fa6 100755
--- a/frontend/docker-setup.sh
+++ b/frontend/docker-setup.sh
@@ -10,7 +10,7 @@ fi
 
 npm ci
 
-if [ $CI -eq 'true' ]; then
+if [ $CI -eq 1 ]; then
   npm run build
   npm run preview
 else