diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d13b023..525c15a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -44,8 +44,9 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            GIT_TAG=$GITHUB_REF_NAME
-            GIT_COMMIT=$GITHUB_SHA
+            BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
+            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
index 72e15e0..8cbdf0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,9 +9,9 @@ RUN yarn build
 # build app
 FROM golang:1.17.6-alpine AS app-builder
 
-ARG GIT_TAG=dev
-ARG GIT_COMMIT=dev
-ARG DATETIME
+ARG VERSION=dev
+ARG REVISION=dev
+ARG BUILDTIME
 
 RUN apk add --no-cache git make build-base
 
@@ -30,8 +30,8 @@ COPY --from=web-builder /web/build.go ./web
 ENV GOOS=linux
 ENV CGO_ENABLED=1
 
-RUN go build -ldflags "-s -w -X main.version=${GIT_TAG} -X main.commit=${GIT_COMMIT} -X main.date=${DATETIME}" -o bin/autobrr cmd/autobrr/main.go
-RUN go build -ldflags "-s -w -X main.version=${GIT_TAG} -X main.commit=${GIT_COMMIT} -X main.date=${DATETIME}" -o bin/autobrrctl cmd/autobrrctl/main.go
+RUN go build -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${REVISION} -X main.date=${BUILDTIME}" -o bin/autobrr cmd/autobrr/main.go
+RUN go build -ldflags "-s -w -X main.version=${VERSION} -X main.commit=${REVISION} -X main.date=${BUILDTIME}" -o bin/autobrrctl cmd/autobrrctl/main.go
 
 # build runner
 FROM alpine:latest