diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 1fe92a57..11fa61a6 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -46,12 +46,12 @@ jobs:
       - name: Publish bootstrap provider image
         run: |
           make BOOTSTRAP_IMG_TAG=${{ env.VERSION }} docker-push-bootstrap
-          make docker-manifest-bootstrap
+          make BOOTSTRAP_IMG_TAG=${{ env.VERSION }} docker-manifest-bootstrap
 
       - name: Publish controlplane provider image
         run: |
           make CONTROLPLANE_IMG_TAG=${{ env.VERSION }} docker-push-controlplane
-          make docker-manifest-controlplane
+          make CONTROLPLANE_IMG_TAG=${{ env.VERSION }} docker-manifest-controlplane
 
       - name: Build manifests
         run: |
diff --git a/Makefile b/Makefile
index b24ef546..23425d03 100644
--- a/Makefile
+++ b/Makefile
@@ -254,7 +254,7 @@ docker-push-bootstrap: docker-push-bootstrap-amd64 docker-push-bootstrap-arm64
 .PHONY: docker-manifest-bootstrap
 docker-manifest-bootstrap: docker-push-bootstrap
 	docker manifest rm ${BOOTSTRAP_IMG} || true
-	docker manifest create ${BOOTSTRAP_IMG} --amend ${BOOTSTRAP_IMG}-amd64 --amend ${BOOTSTRAP_IMG}-arm64
+	docker manifest create ${BOOTSTRAP_IMG}--amend ${BOOTSTRAP_IMG}-amd64 --amend ${BOOTSTRAP_IMG}-arm64
 	docker manifest annotate ${BOOTSTRAP_IMG} ${BOOTSTRAP_IMG}-amd64 --arch=amd64
 	docker manifest annotate ${BOOTSTRAP_IMG} ${BOOTSTRAP_IMG}-arm64 --arch=arm64
 	docker manifest push ${BOOTSTRAP_IMG}