diff --git a/Makefile b/Makefile
index 8d1422f..f483a29 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ tidy:
 	go mod tidy
 
 watch:
-	modd
+	go run github.com/cortesi/modd/cmd/modd@v0.8.1
 
 lint:
 	golangci-lint run --enable-all
diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile
index e631f6a..cb10b7f 100644
--- a/misc/docker/Dockerfile
+++ b/misc/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19 AS build
+FROM reg.cadoles.com/proxy_cache/library/golang:1.21 AS build
 
 ARG HTTP_PROXY=
 ARG HTTPS_PROXY=
@@ -18,14 +18,15 @@ RUN cp -f misc/docker/config-patch.txt misc/release/config-patch.txt \
     && npm ci \
     && make ARCH_TARGETS=amd64 release
 
-FROM busybox
+FROM reg.cadoles.com/proxy_cache/library/busybox
+
+RUN adduser -D -h /app fsmtp
 
 COPY --from=build /src/release/fake-smtp-linux-amd64 /app
-
-WORKDIR /app
-
-RUN mkdir -p /app
+RUN chown -R fsmtp:fsmtp /app
 
 EXPOSE 8080 2525
+USER fsmtp
+WORKDIR /app
 
 CMD ["bin/fake-smtp", "--config", "config.yml"]
\ No newline at end of file