diff --git a/makefile b/makefile
index 62b6d8d..a425b78 100644
--- a/makefile
+++ b/makefile
@@ -1,18 +1,18 @@
 SOURCES := $(shell find . -name '*.go')
 BINARY := kube-bench
-DOCKER_ORG ?= aquasec
-VERSION ?= $(shell git rev-parse --short=7 HEAD)
-KUBEBENCH_VERSION ?= $(shell git describe --tags --abbrev=0)
+DOCKER_ORG ?= voereir
+VERSION ?= v0.10.3-T5.0.0
+KUBEBENCH_VERSION ?= v0.10.3-T5.0.0
 IMAGE_NAME ?= $(DOCKER_ORG)/$(BINARY):$(VERSION)
 IMAGE_NAME_UBI ?= $(DOCKER_ORG)/$(BINARY):$(VERSION)-ubi
 GOOS ?= linux
 BUILD_OS := linux
 uname := $(shell uname -s)
 BUILDX_PLATFORM ?= linux/amd64,linux/arm64,linux/arm,linux/ppc64le,linux/s390x
-DOCKER_ORGS ?= aquasec public.ecr.aws/aquasecurity
+DOCKER_ORGS ?= voereir
 GOARCH ?= $@
 KUBECTL_VERSION ?= 1.33.0-alpha.3
-ARCH ?= $(shell go env GOARCH)
+ARCH ?= arm64
 
 ifneq ($(findstring Microsoft,$(shell uname -r)),)
 	BUILD_OS := windows
@@ -33,7 +33,9 @@ docker:
 	set -xe; \
 	for org in $(DOCKER_ORGS); do \
 		docker buildx build --tag $${org}/kube-bench:${VERSION} \
-		--platform $(BUILDX_PLATFORM) --push . ; \
+		--platform $(BUILDX_PLATFORM) --push \
+		--build-arg KUBEBENCH_VERSION=$(KUBEBENCH_VERSION) \
+		--build-arg KUBECTL_VERSION=$(KUBECTL_VERSION) . ; \
 	done
 
 build: $(BINARY)