diff --git a/docker-compose.yml b/docker-compose.yml
index a39b735ee..f1d8a4cd0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,8 @@
 services:
   web:
     build:
-      context: .
-      dockerfile: docker/Dockerfile
+      context: ./docker
+      dockerfile: Dockerfile
     container_name: cacti_web
     ports:
       - "${WEB_PORT:-8080}:80"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 48e32015d..5124a8a7c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -34,7 +34,7 @@ RUN a2enmod rewrite headers proxy proxy_fcgi setenvif \
     && a2dismod mpm_prefork \
     && a2enmod mpm_event
 
-COPY docker/apache.conf /etc/apache2/sites-available/cacti.conf
+COPY apache.conf /etc/apache2/sites-available/cacti.conf
 RUN a2dissite 000-default && a2ensite cacti
 
 # Static PHP settings (runtime-tunable values are set in entrypoint.sh)
@@ -72,7 +72,7 @@ RUN mkdir -p /var/www/html/cacti/cache \
              /var/www/html/cacti/log \
     && chown -R www-data:www-data /var/www/html/cacti
 
-COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh
 
 # App code comes from the docker-compose bind mount, not from this image.