diff --git a/dev-tools/setup.sh b/dev-tools/setup.sh
index e365bea6..181e1399 100755
--- a/dev-tools/setup.sh
+++ b/dev-tools/setup.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+export XDEBUG_MODE=off
+
 subdomain=0
 
 # Check if the first argument starts with '--'
diff --git a/php-fpm/rootfs/usr/local/bin/run.sh b/php-fpm/rootfs/usr/local/bin/run.sh
index 80f79ef9..f8875924 100755
--- a/php-fpm/rootfs/usr/local/bin/run.sh
+++ b/php-fpm/rootfs/usr/local/bin/run.sh
@@ -2,10 +2,10 @@
 
 if [ "enable" = "$XDEBUG" ]; then
     echo "Enabling XDebug"
-    phpenmod -s fpm xdebug
+    phpenmod xdebug
 else
     echo "Disabling XDebug"
-    phpdismod -s fpm xdebug
+    phpdismod xdebug
 fi
 
 if [ -n "${LANDO_INFO}" ] && [ 'null' != "$(echo "${LANDO_INFO}" | jq -r .mailhog)" ]; then