diff --git a/Dockerfile b/Dockerfile
index b5a7b28..2f27a83 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN cd /server &&\
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
 WORKDIR /app
-COPY --from=builder /server/mapserver /bin/mapserver
+COPY --from=builder /server/output/mapserver-linux-x86_64 /bin/mapserver
 
 EXPOSE 8080
 CMD ["/bin/mapserver"]
diff --git a/Makefile b/Makefile
index 3921c64..3700c9e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,7 @@ BINARIES += $(OUT_DIR)/mapserver-linux-arm
 
 JS_BUNDLE = static/js/bundle.js
 
-all: $(STATIC_VFS)
-	$(GO_BUILD)
+all: $(STATIC_VFS) $(OUT_DIR)/mapserver-linux-x86_64
 
 $(OUT_DIR):
 	mkdir $@