diff --git a/.dockerignore b/.dockerignore
index 9cf1967..8182870 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,8 @@ config*.yml
 !config.default.yml
 *.db
 *.exe
-wakapi
\ No newline at end of file
+wakapi
+Dockerfile
+docker-compose.yml
+.dockerignore
+.git*
diff --git a/Dockerfile b/Dockerfile
index 72ea1f5..8dea291 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,12 +2,21 @@
 
 FROM golang:1.15 AS build-env
 WORKDIR /src
+
 ADD ./go.mod .
 RUN go mod download
 
 ADD . .
 RUN go build -o wakapi
 
+WORKDIR /app
+RUN cp /src/wakapi . && \
+    cp /src/config.default.yml config.yml && \
+    sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' config.yml && \
+    cp /src/version.txt . && \
+    cp -r /src/static /src/data /src/migrations /src/views . && \
+    cp /src/wait-for-it.sh .
+
 # Run Stage
 
 # When running the application using `docker run`, you can pass environment variables
@@ -27,17 +36,7 @@ ENV WAKAPI_PASSWORD_SALT ''
 ENV WAKAPI_LISTEN_IPV4 '0.0.0.0'
 ENV WAKAPI_INSECURE_COOKIES 'true'
 
-COPY --from=build-env /src/wakapi /app/
-COPY --from=build-env /src/config.default.yml /app/config.yml
-COPY --from=build-env /src/version.txt /app/
-
-RUN sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' /app/config.yml
-
-ADD static /app/static
-ADD data /app/data
-ADD migrations /app/migrations
-ADD views /app/views
-ADD wait-for-it.sh .
+COPY --from=build-env /app .
 
 VOLUME /data