diff --git a/Makefile b/Makefile
index 314d9dd51b..6f08633a64 100644
--- a/Makefile
+++ b/Makefile
@@ -129,8 +129,7 @@ test-e2e: $(GINKGO) $(KIND) $(KUSTOMIZE) e2e-image test-e2e-image-prerequisites
 
 .PHONY: e2e-image
 e2e-image: CONTROLLER_IMG_TAG = "gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e"
-e2e-image: docker-pull-prerequisites ## Build the docker image for controller-manager
-	docker build -f $(CONTAINERFILE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG_TAG)
+e2e-image: docker-build
 
 # Pull all the images references in test/e2e/data/e2e_conf.yaml
 test-e2e-image-prerequisites:
@@ -228,11 +227,11 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 
 .PHONY: docker-build
 docker-build: docker-pull-prerequisites ## Build the docker image for controller-manager
-	docker build -f $(CONTAINERFILE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG)-$(ARCH):$(TAG)
+	docker build -f $(CONTAINERFILE) --build-arg goproxy=$(GOPROXY) --build-arg ARCH=$(ARCH) --build-arg LDFLAGS="$(LDFLAGS)" . -t $(CONTROLLER_IMG_TAG)
 
 .PHONY: docker-push
 docker-push: ## Push the docker image
-	docker push $(CONTROLLER_IMG)-$(ARCH):$(TAG)
+	docker push $(CONTROLLER_IMG_TAG)
 
 .PHONY: docker-pull-prerequisites
 docker-pull-prerequisites:
@@ -248,14 +247,14 @@ docker-pull-prerequisites:
 docker-build-all: $(addprefix docker-build-,$(ALL_ARCH))
 
 docker-build-%:
-	$(MAKE) ARCH=$* docker-build
+	$(MAKE) CONTROLLER_IMG_TAG=$(CONTROLLER_IMG)-$*:$(TAG) docker-build
 
 .PHONY: docker-push-all ## Push all the architecture docker images
 docker-push-all: $(addprefix docker-push-,$(ALL_ARCH))
 	$(MAKE) docker-push-manifest
 
 docker-push-%:
-	$(MAKE) ARCH=$* docker-push
+	$(MAKE) CONTROLLER_IMG_TAG=$(CONTROLLER_IMG)-$*:$(TAG) docker-push
 
 .PHONY: docker-push-manifest
 docker-push-manifest: ## Push the fat manifest docker image.