diff --git a/Dockerfile b/Dockerfile
index 312b7cf..d8b13e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,26 @@
-FROM golang:1.14.4-alpine3.12
+FROM golang:1.22-alpine3.19
 
 WORKDIR /go/src/github.com/mgerb/ServerStatus
 ADD . .
 RUN apk add --no-cache git alpine-sdk
-RUN go get -u github.com/golang/dep/cmd/dep
-RUN dep ensure
+RUN go get
 RUN make linux
 
 
-FROM alpine:3.12
+FROM alpine:3.19
+
 ARG UNAME="server-status"
 ARG GNAME="server-status"
 ARG UID=1000
 ARG GID=1000
+
 WORKDIR /server-status
 COPY --from=0 /go/src/github.com/mgerb/ServerStatus/dist/ServerStatus-linux .
-ENTRYPOINT ./ServerStatus-linux
-RUN addgroup -g ${GID} "${GNAME}" && adduser -D -u ${UID} -G "${GNAME}" "${UNAME}" &&\
-    chown "${UNAME}":"${GNAME}" -R /server-status/ &&\
-    apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+RUN addgroup -g ${GID} "${GNAME}"
+RUN adduser -D -u ${UID} -G "${GNAME}" "${UNAME}" &&\
+    chown "${UNAME}":"${GNAME}" -R /server-status/
+
 USER ${UNAME}
+
+ENTRYPOINT ./ServerStatus-linux
diff --git a/docker-compose.yml b/docker-compose.yml
index 6552c4a..a3c1096 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,9 +3,5 @@ version: "3"
 services:
   server-status:
     image: mgerb/server-status:latest
-    build:
-      args:
-        UID: 1000
-        GID: 1000
     volumes:
     - ./config.json:/server-status/config.json