diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index a524b92b..df4f5143 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Build and publish docker plugin
         env:
           REPO: ghcr.io/${{ github.repository }}
-          VERSION: edge
+          TAG_NAME: edge
         run: |-
-          make plugin
-          docker plugin push "$REPO:${TAG_NAME}"
+          REPO=${{ env.REPO }} VERSION=${{ env.TAG_NAME }} make plugin
+          docker plugin push "${{ env.REPO }}:${{ env.TAG_NAME }}"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 06b4a4ad..eccc3180 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -32,7 +32,6 @@ jobs:
       - name: Build and publish docker plugin
         env:
           REPO: ghcr.io/${{ github.repository }}
-          VERSION: ${{ env.TAG_NAME }}
         run: |-
-          make plugin
-          docker plugin push "$REPO:${TAG_NAME}"
+          REPO=${{ env.REPO }} VERSION=${{ env.TAG_NAME }} make plugin
+          docker plugin push "${{ env.REPO }}:${{ env.TAG_NAME }}"
diff --git a/Makefile b/Makefile
index f2ccf5de..9c4bbcd7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 .PHONY: all build
 
 VERSION ?= 0.8
-GO_VERSION := 1.19.1
-GOLANGCI_LINT_VERSION := v1.49.0
-REPO := openpolicyagent/opa-docker-authz-v2
+GO_VERSION := 1.21.4
+GOLANGCI_LINT_VERSION := v1.55.2
+REPO ?= openpolicyagent/opa-docker-authz-v2
 
 all: build
 
diff --git a/build.sh b/build.sh
index 894ff9f9..27c44b4d 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,7 @@ echo "Building opa-docker-authz version: $VERSION (OPA version: $OPA_VERSION)"
 echo -e "\nBuilding opa-docker-authz ..."
 CGO_ENABLED=0 go build -ldflags \
     "-X github.com/open-policy-agent/opa-docker-authz/version.Version=$VERSION -X github.com/open-policy-agent/opa-docker-authz/version.OPAVersion=$OPA_VERSION" \
+    -buildvcs=false \
     -o opa-docker-authz
 
 echo -e "\n... done!"