diff --git a/src/Handler.php b/src/Handler.php
index d86d5c5e6f8933d3bd884289e2364f3d968100b0..83c93a21532d2ae49f481cf8149c387eeb53a66f 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -279,7 +279,7 @@ class Handler extends BaseHandler {
 
     $projectRoot = getenv('CI_PROJECT_DIR');
     if (empty($projectRoot)) {
-      $projectRoot = '.';
+      $projectRoot = getcwd();
     }
     else {
       $projectRoot = $options['ci_home'] . $projectRoot;
diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index 1a94c19b53940e6493e3ae33a238c4c836f6c204..2bdcaa3c674c47a35ad414f99ebeb570d04f9045 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -42,7 +42,7 @@ services:
       SSH_AUTH_SOCK: /ssh-agent
 {% endif %}
     volumes:
-      - {{ projectroot }}/:/var/www/html
+      - {{ projectroot }}:/var/www/html
       - {{ projectroot }}/drush:/etc/drush
 {% if php.ssh %}
       - $SSH_AUTH_SOCK:/ssh-agent
@@ -78,7 +78,7 @@ services:
       {{ webserver.type|upper }}_BACKEND_HOST: php
       {{ webserver.type|upper }}_SERVER_ROOT: /var/www/html/{{ webRoot }}
     volumes:
-      - {{ projectroot }}/:/var/www/html
+      - {{ projectroot }}:/var/www/html
     labels:
       traefik.backend: '{{ projectname }}_{{ webserver.type }}_1'
       traefik.port: '80'