diff --git a/Dockerfile b/Dockerfile
index 22b6115..9744984 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,22 @@
-ARG GO_VERSION=1.17
-ARG DEBIAN_VERSION=11
-ARG DEBIAN_VERSION_NAME=bullseye
-
 ## Build stage ##
-FROM docker.io/library/golang:${GO_VERSION}-${DEBIAN_VERSION_NAME} AS builder
-
+FROM golang as builder
 WORKDIR /build
 COPY go.mod go.sum ./
 RUN go mod download
-
 COPY . .
-#RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o rageshake
 RUN go build -o rageshake
 
 ## Runtime stage, debug variant ##
-FROM  gcr.io/distroless/static-debian${DEBIAN_VERSION}:debug-nonroot AS debug
+FROM  debian:bullseye as debug
 COPY --from=builder /build/rageshake /rageshake
 WORKDIR /
 EXPOSE 9110
 ENTRYPOINT ["/rageshake"]
 
 ## Runtime stage ##
-FROM  gcr.io/distroless/static-debian${DEBIAN_VERSION}:nonroot
-COPY --from=builder /build/rageshake /rageshake
+FROM  debian:bullseye as rageshake
+LABEL org.opencontainers.image.source https://git.batsense.net/mystiq/rageshake
 WORKDIR /
+COPY --from=builder /build/rageshake /bin/
 EXPOSE 9110
-ENTRYPOINT ["/rageshake"]
+ENTRYPOINT ["/bin/rageshake"]