diff --git a/Makefile b/Makefile
index 99793a2..73eafb2 100644
--- a/Makefile
+++ b/Makefile
@@ -117,22 +117,14 @@ PLATFORMS ?= linux/arm64,linux/amd64
 docker-buildx: ## Build and push docker image for the manager for cross-platform support
 	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
 	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
-	- $(CONTAINER_TOOL) buildx create --name kubernetes-images-sync-operator-builder
-	$(CONTAINER_TOOL) buildx use kubernetes-images-sync-operator-builder
 	- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --build-arg IMAGE_VERSION_TAG=${CURRENT_VERSION} --tag ${IMG}:${CURRENT_VERSION} -f Dockerfile.cross .
-	- $(CONTAINER_TOOL) buildx rm kubernetes-images-sync-operator-builder
 	rm Dockerfile.cross
 
 
 .PHONY: docker-buildx-job-container
 docker-buildx-job-container: ## Build and push docker image for the manager for cross-platform support
 	@cd docker-image-worker && ( \
-		sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross && \
-		$(CONTAINER_TOOL) buildx create --name kubernetes-images-sync-operator-builder || true && \
-		$(CONTAINER_TOOL) buildx use kubernetes-images-sync-operator-builder && \
-		$(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --build-arg IMAGE_VERSION_TAG=${CURRENT_VERSION} --tag ${IMG_WORKER}:${CURRENT_VERSION} -f Dockerfile.cross . && \
-		$(CONTAINER_TOOL) buildx rm kubernetes-images-sync-operator-builder || true && \
-		rm Dockerfile.cross \
+		$(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --build-arg IMAGE_VERSION_TAG=${CURRENT_VERSION} --tag ${IMG_WORKER}:${CURRENT_VERSION} -f Dockerfile . \
 	) && cd ..
 
 .PHONY: build-installer
@@ -220,6 +212,9 @@ helm: manifests kustomize helmify
 	cp chart-defaults/Chart.yaml chart/Chart.yaml && \
 	./update-version.sh $(CURRENT_VERSION) $(IMG)
 
+.PHONY: docker-containers
+docker-containers: docker-buildx docker-buildx-job-container
+
 .PHONY: release # Generates helm chart, builds docker images and pushes them to the registry
 release: helm docker-buildx docker-buildx-job-container release-chart