diff --git a/Dockerfile b/Dockerfile
index baccc5f..843c48c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM golang:1.16-alpine as builder
 WORKDIR /app
-COPY . .
+COPY server server
+COPY Makefile .
 
 ARG VERSION=0.1.0-beta.0
 ENV VERSION="${VERSION}"
@@ -12,8 +13,8 @@ RUN apk add build-base &&\
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
 WORKDIR /root/
-COPY --from=builder /app/build .
-COPY --from=builder /app/app .
-COPY --from=builder /app/templates .
+COPY app app
+COPY templates templates
+COPY --from=builder /app/build build
 EXPOSE 8080
-CMD [ "./server" ]
+CMD [ "./build/server" ]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 880c5e0..4e64ad0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,4 +17,4 @@ services:
   depends_on:
    - db
   env_file:
-   - server/.env
+   - .env