diff --git a/Dockerfile b/Dockerfile
index 57860f2..04db07b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-bookworm
+FROM debian:12-slim
 
 RUN apt-get update && apt-get upgrade -y
 
@@ -9,7 +9,8 @@ COPY ./gemserve /app/gemserve
 WORKDIR /app
 
 RUN chmod +x /app/gemserve && \
-    chown -R user:user /app
+    chown -R root:root /app && \
+    chmod -R 755 /app
 
 USER user
-CMD ["/app/gemserve","0.0.0.0:1965"]
+CMD ["/app/gemserve","--listen","0.0.0.0:1965","--root-path","/srv"]
diff --git a/Makefile b/Makefile
index aaaa95a..7f22874 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ export PATH := $(PATH)
 all: fmt lintfix tidy test clean build
 
 clean:
-	rm -f ./gemserve
+	rm -rf ./dist
 
 debug:
 	@echo "PATH: $(PATH)"
@@ -35,9 +35,10 @@ lintfix: fmt
 	golangci-lint run --fix
 
 build:
-	go build -o ./gemserve ./main.go
+	mkdir -p ./dist
+	CGO_ENABLED=0 go build -o ./dist/gemserve ./main.go
 
-build-docker:
+build-docker: build
 	docker build -t gemserve .
 
 show-updates: