diff --git a/docker-compose.yml b/docker-compose.yml
index 94eb724..60e2230 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,7 @@
 services:
   nginx:
     build:
-      context: .
-      dockerfile: nginx/Dockerfile
+      context: ./nginx/
       args:
         - SELFSIGNED_REQ_HOST=${SA_PUBLIC_DOMAIN_NAME}
         - SELFSIGNED_REQ_ALT_NAMES=DNS:${SA_PUBLIC_DOMAIN_NAME},
@@ -78,8 +77,7 @@
       - seed
   simpleid:
     build:
-      context: .
-      dockerfile: simpleid/Dockerfile
+      context: ./simpleid/
     env_file: environment
     networks:
       - simpleidnet
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 4114ba1..0d48149 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -12,7 +12,7 @@
 			-out /etc/ssl/certs/sa-selfsigned.crt && \
 	apk del openssl
 
-COPY nginx/Dockerfile.entrypoint /nginx-entrypoint
+COPY Dockerfile.entrypoint /nginx-entrypoint
 RUN chmod 544 /nginx-entrypoint
 
 ENTRYPOINT ["/bin/sh", "/nginx-entrypoint"]
diff --git a/simpleid/Dockerfile b/simpleid/Dockerfile
index 8c56da1..f4ad457 100644
--- a/simpleid/Dockerfile
+++ b/simpleid/Dockerfile
@@ -11,7 +11,7 @@
 
 RUN mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini"
 
-COPY simpleid/Dockerfile.entrypoint /simpleid-entrypoint
+COPY Dockerfile.entrypoint /simpleid-entrypoint
 RUN chmod 544 /simpleid-entrypoint
 
 ENTRYPOINT ["/bin/sh", "/simpleid-entrypoint"]