diff --git a/composer.json b/composer.json
index 4c165ecab3bea9a03775eb7aa9f6c5d7bb78cff2..051f18452d4df59c85d0dd5ec3bffc9a0947e5ad 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
         "ext-json": "*",
         "php": ">=5.6",
         "composer-plugin-api": "^1.0.0",
+        "lakedrops/composer-json-utils": "^1.2.0",
         "lakedrops/composer-scripts": "^1.1.0",
         "lakedrops/docker-traefik": "^1.1.0",
         "lakedrops/dotenv": "^1.0.0",
diff --git a/src/Handler.php b/src/Handler.php
index 98b30807b7a78d08aef73da3a63ac788a70a1afd..58c1d64814badbff9a09c49c5633593285cb6758 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -242,7 +242,7 @@ class Handler extends BaseHandler {
         ],
         'php' => [
           'version' => '7.0',
-          'xdebug' => 1,
+          'xdebug' => $this->isCiContext() ? 0 : 1,
         ],
         'webserver' => [
           'type' => 'apache',
@@ -288,12 +288,11 @@ class Handler extends BaseHandler {
         ],
       ], $extra['docker4drupal']);
 
-      $projectRoot = getenv('CI_PROJECT_DIR');
-      if (empty($projectRoot)) {
-        $projectRoot = getcwd();
+      if ($this->isCiContext()) {
+        $projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR'));
       }
       else {
-        $projectRoot = $this->getDockerMountSource($projectRoot);
+        $projectRoot = getcwd();
       }
       $options['projectroot'] = $projectRoot;