diff --git a/Dockerfile b/Dockerfile
index b1c51f1..e1a271d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
-FROM golang:buster AS build-env
+ARG ARCH=
+
+FROM ${ARCH}golang:buster AS build-env
 WORKDIR /app
 ADD . /app
-RUN apt-get update && apt-get upgrade -y
-RUN cd /app && make requirements && make -B pastad
+#RUN apt-get update && apt-get upgrade -y
+RUN cd /app && make requirements && make pastad-static
 
-FROM debian:buster
-RUN apt-get update && apt-get upgrade -y
-RUN mkdir /app
-RUN mkdir /data
+FROM scratch
+#RUN mkdir /app
+#RUN mkdir /data
 WORKDIR /data
 COPY --from=build-env /app/pastad /app/pastad
 COPY --from=build-env /app/mime.types /app/mime.types
-ENTRYPOINT /app/pastad -m /app/mime.types -c /data/pastad.toml
+ENTRYPOINT ["/app/pastad", "-m", "/app/mime.types", "-c", "/data/pastad.toml"]
 VOLUME ["/data"]
diff --git a/Makefile b/Makefile
index 2655a26..76e1e8d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ pasta: cmd/pasta/pasta.go cmd/pasta/storage.go
 	go build $^
 pastad: cmd/pastad/pastad.go cmd/pastad/storage.go
 	go build $^
+pastad-static: cmd/pastad/pastad.go cmd/pastad/storage.go
+	CGO_ENABLED=0 go build -ldflags="-w -s" -o pastad $^
 
 test: pastad pasta
 	go test ./...