diff --git a/Dockerfile b/Dockerfile
index 4f788ac..38ada95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,22 @@
-FROM golang:1.19 AS builder
-
-COPY . /builder
-WORKDIR /builder
-
+FROM golang:1.21.0-alpine AS builder
+RUN apk update && apk upgrade \
+    && apk add --no-cache ca-certificates tzdata \
+    && update-ca-certificates 2>/dev/null || true
+RUN apk add --no-cache make git gcc g++ libc-dev
+ENV GO111MODULE=on
+ENV CGO_ENABLED=1
+ENV GOOS=linux
+WORKDIR /build
+ADD go.mod go.sum ./
+RUN go mod download
+COPY . .
 RUN make build
 
-FROM alpine:3
-
+FROM alpine:3.18.0
+RUN apk update && apk upgrade \
+    && apk add --no-cache ca-certificates tzdata \
+    && update-ca-certificates 2>/dev/null || true
 WORKDIR /app
-
 EXPOSE 8080
-COPY --from=builder /builder/bin .
-
+COPY --from=builder /build/bin .
 ENTRYPOINT ["/app/azure-openai-proxy"]
\ No newline at end of file