diff --git a/Dockerfile b/Dockerfile
index 7867820..e86610c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,8 @@ COPY . ./
 RUN go build -o /notatio
 
 # Stage 2: Create the final image
-FROM alpine
+FROM docker.io/library/alpine:3.18.4
+USER notatio
 WORKDIR /
 
 COPY --from=builder /notatio .
@@ -25,5 +26,8 @@ COPY --from=builder /build/static/ static/
 COPY --from=builder /build/wait-for-postgres.sh ./wait-for-postgres.sh
 
 EXPOSE 9991
-CMD ["./notatio"]
+ENTRYPOINT ["sh", "-c", "sleep 10 && ./notatio"]
 LABEL name=notatio version=latest
+
+HEALTHCHECK --interval=5m --timeout=3s \
+  CMD curl -f http://localhost/ || exit 1
\ No newline at end of file