diff --git a/Dockerfile b/Dockerfile
index c312216..4540f5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,24 @@
 FROM golang:1.25-alpine AS builder
 
+ARG VERSION=dev
+
+RUN apk add --no-cache git
+
 WORKDIR /build
 COPY go.mod go.sum ./
 RUN go mod download
+
 COPY . .
-RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X main.version=$(git describe --tags --always --dirty 2>/dev/null || echo unknown)" -o mcat ./cmd/mcat
+RUN CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X main.version=${VERSION}" -o mcat ./cmd/mcat
 
 FROM alpine:3.21
-RUN apk --no-cache add ca-certificates && \
-    adduser -D -h /srv/mcat mcat
-USER mcat
-WORKDIR /srv/mcat
+
+RUN apk add --no-cache ca-certificates tzdata
+
 COPY --from=builder /build/mcat /usr/local/bin/mcat
-VOLUME /srv/mcat
+
+WORKDIR /srv/mcat
 EXPOSE 8443
+
 ENTRYPOINT ["mcat"]
 CMD ["server", "--config", "/srv/mcat/mcat.toml"]