diff --git a/Dockerfile b/Dockerfile
index d10f793..781a08a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM php:7.0-apache
 COPY htdocs /var/www/html
 COPY htdocs/application/config/stikked.php.dist /var/www/html/application/config/stikked.php
-COPY replace-envvars.sh /bin/
-COPY docker-php-entrypoint /usr/local/bin/
+COPY docker/replace-envvars.sh /bin/
+COPY docker/docker-php-entrypoint /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-php-entrypoint
 
 EXPOSE 80
diff --git a/docker-compose.yml b/docker-compose.yml
index 511b732..a2eec94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - db
     image: stikked
     env_file:
-      stikked-envvars.txt
+      docker/stikked-envvars.txt
     ports:
       - 80:80