diff --git a/Makefile b/Makefile
index 327060fef..bb9beebca 100644
--- a/Makefile
+++ b/Makefile
@@ -140,10 +140,10 @@ build-fsfreeze:
 
 push-fsfreeze: BIN = fsfreeze-pause
 push-fsfreeze:
-	@gcloud docker push $(IMAGE):$(VERSION)
+	@gcloud docker -- push $(IMAGE):$(VERSION)
 ifeq ($(TAG_LATEST), true)
-	gcloud docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
-	gcloud docker push $(IMAGE):latest
+	gcloud docker -- tag $(IMAGE):$(VERSION) $(IMAGE):latest
+	gcloud docker -- push $(IMAGE):latest
 endif
 	@docker images -q $(REGISTRY)/fsfreeze-pause:$(VERSION) > .container-$(DOTFILE_IMAGE)
 
@@ -169,10 +169,10 @@ all-push:
 
 push: .push-$(DOTFILE_IMAGE) push-name
 .push-$(DOTFILE_IMAGE): .container-$(DOTFILE_IMAGE)
-	@gcloud docker push $(IMAGE):$(VERSION)
+	@gcloud docker -- push $(IMAGE):$(VERSION)
 ifeq ($(TAG_LATEST), true)
-	gcloud docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
-	gcloud docker push $(IMAGE):latest
+	gcloud docker -- tag $(IMAGE):$(VERSION) $(IMAGE):latest
+	gcloud docker -- push $(IMAGE):latest
 endif
 	@docker images -q $(IMAGE):$(VERSION) > $@
 
diff --git a/hack/gcr-push.sh b/hack/gcr-push.sh
index da137e57e..835b3eed5 100755
--- a/hack/gcr-push.sh
+++ b/hack/gcr-push.sh
@@ -51,10 +51,6 @@ gcloud auth activate-service-account --key-file nolanb-vmware-55ce4993acec.json
 #openssl aes-256-cbc -K $encrypted_f58ab4413c21_key -iv $encrypted_f58ab4413c21_iv -in heptio-images-fac92d2303ac.json.enc -out heptio-images-fac92d2303ac.json -d
 #gcloud auth activate-service-account --key-file heptio-images-fac92d2303ac.json
 unset GIT_HTTP_USER_AGENT
-mkdir -p /home/travis/.docker
-touch /home/travis/.docker/config.json
-# There's a prompt when trying to do this
-#echo "Y" | gcloud beta auth configure-docker
 
 echo "DIAGNOSTICS"
 ls -al .