diff --git a/composer.json b/composer.json
index 302a68f1a19fa47ab3c34c32b6d9d811a28ae0d3..18456a03379c0871d691f04f9597f6189e8a6033 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "ext-json": "*",
         "php": ">=7.0",
         "composer-plugin-api": "^1.0.0",
-        "lakedrops/composer-json-utils": "^1.3.2",
+        "lakedrops/composer-json-utils": "^1.3.3",
         "lakedrops/docker-traefik": "^1.1.3",
         "lakedrops/dotenv": "^1.1.3",
         "twig/twig": "^1.23.1"
diff --git a/src/Handler.php b/src/Handler.php
index 1b6b9480301b0053785d6ab4f6521f82a0c03527..b586407142bf05ad564fc56343700eb04bcba9ac 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -240,7 +240,7 @@ class Handler extends BaseHandler {
         ],
         'php' => [
           'version' => '7.0',
-          'xdebug' => $this->isCiContext() ? 0 : 1,
+          'xdebug' => $this->isLocalDevMode() ? 1 : 0,
         ],
         'webserver' => [
           'type' => 'apache',
@@ -286,7 +286,7 @@ class Handler extends BaseHandler {
         ],
       ], $extra['docker4drupal']);
 
-      if ($this->isCiContext()) {
+      if ($this->isCiContext() || $this->isLocalDevMode()) {
         $projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR'));
       }
       else {