diff --git a/Dockerfile b/Dockerfile
index 4579710..95c75bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,24 @@
 FROM golang:alpine as builder
+
 ARG IMG_PATH=/opt/pics
 ARG EXHAUST_PATH=/opt/exhaust
-RUN apk update ;\
-    apk add alpine-sdk ;\
-    git clone https://github.com/webp-sh/webp_server_go /build ;\
-    cd /build ;\
-    sed -i "s|.\/pics|${IMG_PATH}|g" config.json ;\
-    sed -i "s|\"\"|\"${EXHAUST_PATH}\"|g" config.json ;\
-    sed -i 's/127.0.0.1/0.0.0.0/g' config.json
-WORKDIR /build
-RUN go build -o webp-server .
+RUN apk update && apk add alpine-sdk && mkdir /build
+COPY go.mod /build
+RUN cd /build && go mod download
+
+COPY . /build
+RUN cd /build && sed -i "s|.\/pics|${IMG_PATH}|g" config.json \
+&& sed -i "s|\"\"|\"${EXHAUST_PATH}\"|g" config.json \
+&& sed -i 's/127.0.0.1/0.0.0.0/g' config.json \
+&& make docker
+
+
+
 FROM alpine
+
 COPY --from=builder /build/webp-server  /usr/bin/webp-server
 COPY --from=builder /build/config.json /etc/config.json
+
 WORKDIR /opt
 VOLUME /opt/exhaust
 CMD ["/usr/bin/webp-server", "--config", "/etc/config.json"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 8eb452f..63d1c4e 100644
--- a/Makefile
+++ b/Makefile
@@ -24,3 +24,6 @@ test:
 clean:
 	rm -rf builds
 	rm -rf prefetch
+
+docker:
+	go build -ldflags="-s -w" -o webp-server .
\ No newline at end of file