diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bc1e4db..d13b023 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -43,6 +43,9 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      
+          build-args: |
+            GIT_TAG=$GITHUB_REF_NAME
+            GIT_COMMIT=$GITHUB_SHA
+
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
index 51ada0b..72e15e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,10 @@ RUN yarn build
 # build app
 FROM golang:1.17.6-alpine AS app-builder
 
+ARG GIT_TAG=dev
+ARG GIT_COMMIT=dev
+ARG DATETIME
+
 RUN apk add --no-cache git make build-base
 
 ENV SERVICE=autobrr
@@ -26,8 +30,8 @@ COPY --from=web-builder /web/build.go ./web
 ENV GOOS=linux
 ENV CGO_ENABLED=1
 
-RUN make -f Makefile build/app
-RUN make -f Makefile build/ctl
+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
 
 # build runner
 FROM alpine:latest
diff --git a/Makefile b/Makefile
index 609f949..b65e678 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ build/web:
 	cd web && yarn build
 
 build/docker:
-	docker build -t autobrr:dev -f Dockerfile .
+	docker build -t autobrr:dev -f Dockerfile . --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT)
 
 clean:
 	$(RM) -rf bin