diff --git a/core/headscale/Makefile b/core/headscale/Makefile
index 9468ad6..ee080a3 100644
--- a/core/headscale/Makefile
+++ b/core/headscale/Makefile
@@ -1,5 +1,6 @@
 repo_name ?= giolekva
 podman ?= docker
+docker_flags=--provenance=false --sbom=false
 ifeq ($(podman), podman)
 manifest_dest=docker://docker.io/$(repo_name)/headscale-api:latest
 endif
@@ -22,15 +23,14 @@
 	go build -o server_amd64 *.go
 
 push_arm64: clean build_arm64
-	$(podman) build --platform linux/arm64 --tag=$(repo_name)/headscale-api:arm64 .
+	$(podman) build --platform linux/arm64 --tag=$(repo_name)/headscale-api:arm64 $(docker_flags) .
 	$(podman) push $(repo_name)/headscale-api:arm64
 
 push_amd64: clean build_amd64
-	$(podman) build --platform linux/amd64 --tag=$(repo_name)/headscale-api:amd64 .
+	$(podman) build --platform linux/amd64 --tag=$(repo_name)/headscale-api:amd64 $(docker_flags) .
 	$(podman) push $(repo_name)/headscale-api:amd64
 
 
 push: push_arm64 push_amd64
 	$(podman) manifest create $(repo_name)/headscale-api:latest $(repo_name)/headscale-api:arm64 $(repo_name)/headscale-api:amd64
-	$(podman) manifest push $(repo_name)/headscale-api:latest $(manifest_dest)
-	$(podman) manifest rm $(repo_name)/headscale-api:latest
+	$(podman) manifest push --purge $(repo_name)/headscale-api:latest $(manifest_dest)
diff --git a/core/headscale/controller/Makefile b/core/headscale/controller/Makefile
index d32e0e4..67e56f2 100644
--- a/core/headscale/controller/Makefile
+++ b/core/headscale/controller/Makefile
@@ -1,3 +1,4 @@
+docker_flags=--provenance=false --sbom=false
 
 # Image URL to use all building/pushing image targets
 IMG ?= giolekva/headscale-controller:latest
@@ -87,16 +88,15 @@
 
 .PHONY: docker-build
 docker-build: test clean build_arm64 build_amd64 ## Build docker image with the manager.
-	podman build --platform linux/arm64 --tag ${IMG}-arm64 .
-	podman build --platform linux/amd64 --tag ${IMG}-amd64 .
+	docker build --platform linux/arm64 --tag ${IMG}-arm64 $(docker_flags) .
+	docker build --platform linux/amd64 --tag ${IMG}-amd64 $(docker_flags) .
 
 .PHONY: docker-push
-docker-push: ## Push docker image with the manager.
-	podman push ${IMG}-arm64
-	podman push ${IMG}-amd64
-	podman manifest create ${IMG} ${IMG}-arm64 ${IMG}-amd64
-	podman manifest push ${IMG} docker://docker.io/${IMG}
-	podman manifest rm ${IMG}
+docker-push: docker-build
+	docker push ${IMG}-arm64
+	docker push ${IMG}-amd64
+	docker manifest create ${IMG} ${IMG}-arm64 ${IMG}-amd64
+	docker manifest push --purge ${IMG}
 
 ##@ Deployment
 
diff --git a/core/headscale/controller/api/v1/groupversion_info.go b/core/headscale/controller/api/v1/groupversion_info.go
index 2449e9e..7536a7e 100644
--- a/core/headscale/controller/api/v1/groupversion_info.go
+++ b/core/headscale/controller/api/v1/groupversion_info.go
@@ -15,8 +15,8 @@
 */
 
 // Package v1 contains API Schema definitions for the headscale v1 API group
-//+kubebuilder:object:generate=true
-//+groupName=headscale.dodo.cloud
+// +kubebuilder:object:generate=true
+// +groupName=headscale.dodo.cloud
 package v1
 
 import (