diff --git a/Dockerfile b/Dockerfile
index b9b149a..e17be8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,27 @@
 # golang:1.24-alpine, 2026-02-26
 FROM golang@sha256:8bee1901f1e530bfb4a7850aa7a479d17ae3a18beb6e09064ed54cfd245b7191 AS builder
 
-RUN apk add --no-cache git build-base
-
+RUN apk add --no-cache git build-base make
 WORKDIR /src
+
+# golangci-lint v2.1.6, 2026-02-26
+RUN go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@eabc2638a66daf5bb6c6fb052a32fa3ef7b6600d
+
 COPY go.mod go.sum ./
 RUN go mod download
-
 COPY . .
 
 # Run all checks — build fails if branch is not green
-RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v2.1.6
 RUN make check
 
 ARG VERSION=dev
 RUN go build -ldflags "-X main.Version=${VERSION}" -o /chatd ./cmd/chatd
+RUN go build -o /chat-cli ./cmd/chat-cli
 
 # alpine:3.21, 2026-02-26
 FROM alpine@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709
 
 RUN apk add --no-cache ca-certificates
 COPY --from=builder /chatd /usr/local/bin/chatd
-
-WORKDIR /data
 EXPOSE 8080
-
-ENTRYPOINT ["chatd"]
+CMD ["chatd"]