diff --git a/docker-compose.yml b/docker-compose.yml
index b62f9e1..25cf8b9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,6 @@ services:
     php-cli:
         image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php-cli
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-php-cli
-        working_dir: /project
         entrypoint: php
         command: -S 0.0.0.0:9999
         build:
@@ -16,7 +15,6 @@ services:
     composer:
         image: ${DOCKER_CONTAINER_OWNER}/${DOCKER_CONTAINER_PROJECT}-php-cli
         container_name: ${DOCKER_CONTAINER_OWNER}-${DOCKER_CONTAINER_PROJECT}-composer
-        working_dir: /project
         entrypoint: composer
         volumes:
             - .:/project
diff --git a/docker/config/Dockerfile b/docker/config/Dockerfile
index f581f9c..989e520 100644
--- a/docker/config/Dockerfile
+++ b/docker/config/Dockerfile
@@ -127,3 +127,5 @@ RUN sed -i 's/^# export/export/g; \
 # Use project-related binaries globally
 #
 ENV PATH="/project/vendor/bin:${PATH}"
+
+WORKDIR /project