diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml
index c8dbef185..c41c7ff47 100644
--- a/.github/workflows/e2e-test-kind.yaml
+++ b/.github/workflows/e2e-test-kind.yaml
@@ -51,7 +51,7 @@ jobs:
       - name: Build Velero Image
         if: steps.image-cache.outputs.cache-hit != 'true'
         run: |
-          SAVE_IMAGE=false IMAGE=velero VERSION=pr-test make container
+          IMAGE=velero VERSION=pr-test make container
           docker save velero:pr-test -o ./velero.tar
   # Run E2E test against all kubernetes versions on kind
   run-e2e-test:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index da8a979de..d00606acd 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -26,7 +26,7 @@ jobs:
     - uses: google-github-actions/setup-gcloud@v0
       with:
         version: '285.0.0'
-        service_account_key: ${{ secrets.GCP_SA_KEY }}
+        service_account_key: ${{ secrets.GCS_SA_KEY }}
         export_default_credentials: true
     - run: gcloud info
 
diff --git a/Makefile b/Makefile
index f44fd6adb..4ac64f002 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,6 @@ VERSION ?= main
 
 TAG_LATEST ?= false
 
-SAVE_IMAGE ?= true
 ifeq ($(TAG_LATEST), true)
 	IMAGE_TAGS ?= $(IMAGE):$(VERSION) $(IMAGE):latest
 else
@@ -210,7 +209,7 @@ endif
 	--build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \
 	-f $(VELERO_DOCKERFILE) .
 	@echo "container: $(IMAGE):$(VERSION)"
-ifeq ($(SAVE_IMAGE), true)
+ifeq ($(BUILDX_OUTPUT_TYPE), "registry")
 	@docker pull $(IMAGE):$(VERSION)
 	@docker save $(IMAGE):$(VERSION) -o $(BIN)-$(VERSION).tar
 	@gzip $(BIN)-$(VERSION).tar