diff --git a/Dockerfile b/Dockerfile
index d53fcdc..28c853e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,12 +4,13 @@ WORKDIR /app
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . .
-RUN make build
+RUN make build build-cli
 
 FROM alpine:latest
 RUN mkdir /data
 VOLUME /data
 WORKDIR /data
 COPY --from=build /app/build/redka /usr/local/bin/redka
+COPY --from=build /app/build/redka-cli /usr/local/bin/redka-cli
 EXPOSE 6379
 CMD ["redka", "-h", "0.0.0.0", "-p", "6379", "redka.db"]
diff --git a/Makefile b/Makefile
index c45b032..8e6bb2d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,5 +33,8 @@ test:
 build:
 	@CGO_ENABLED=1 go build -ldflags "-s -w -X main.version=$(build_ver) -X main.commit=$(build_rev) -X main.date=$(build_date)" -trimpath -o build/redka -v cmd/redka/main.go
 
+build-cli:
+	@CGO_ENABLED=1 go build -ldflags "-s -w" -trimpath -o build/redka-cli -v cmd/cli/main.go
+
 run:
 	@./build/redka