diff --git a/Dockerfile b/Dockerfile
index 00a807d..9dc1af1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} golang:1.21 as build-env
+FROM --platform=${BUILDPLATFORM} golang as build-env
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -11,13 +11,19 @@ RUN apt-get install -yq --no-install-recommends git
 COPY . /go/src/github.com/vincejv/gpon-parser
 WORKDIR /go/src/github.com/vincejv/gpon-parser
 
-# Build
+# Compile go binaries
 ENV GOPATH=/go
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build -v -a -ldflags "-s -w" -o /go/bin/gpon-parser .
 
+# Build final image from alpine
 FROM --platform=${TARGETPLATFORM} alpine:latest
 RUN apk --update --no-cache add curl && rm -rf /var/cache/apk/*
 COPY --from=build-env /go/bin/gpon-parser /usr/bin/gpon-parser
+
+# Create a group and user
+RUN addgroup -S gpon-parser && adduser -S gpon-parser -G gpon-parser
+USER gpon-parser
+
 ENTRYPOINT ["gpon-parser"]
 
 EXPOSE 8092
\ No newline at end of file