diff --git a/build/build-image/cross/Makefile b/build/build-image/cross/Makefile
index 9578e27ee34..bb760eba03c 100644
--- a/build/build-image/cross/Makefile
+++ b/build/build-image/cross/Makefile
@@ -24,4 +24,4 @@ build:
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
 
 push: build
-	gcloud docker --server=gcr.io push gcr.io/google_containers/$(IMAGE):$(TAG)
+	gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)
diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile
index 9dd5b1b0dc8..d438557a38e 100644
--- a/build/debian-iptables/Makefile
+++ b/build/debian-iptables/Makefile
@@ -55,6 +55,6 @@ endif
 	docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
 
 push: build
-	gcloud docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
+	gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
 
 all: push
diff --git a/build/kube-dns/Makefile b/build/kube-dns/Makefile
index 0628ecd30f8..a4f12d927cc 100644
--- a/build/kube-dns/Makefile
+++ b/build/kube-dns/Makefile
@@ -60,6 +60,6 @@ container:
 	rm -rf $(TEMP_DIR)
 
 push: container
-	gcloud docker push $(REGISTRY)/kubedns-$(ARCH):$(TAG)
+	gcloud docker -- push $(REGISTRY)/kubedns-$(ARCH):$(TAG)
 
 .PHONY: all container push
diff --git a/build/pause/Makefile b/build/pause/Makefile
index 0471838ed02..aff62415ebc 100644
--- a/build/pause/Makefile
+++ b/build/pause/Makefile
@@ -82,13 +82,13 @@ endif
 
 push: .push-$(ARCH)
 .push-$(ARCH): .container-$(ARCH)
-	gcloud docker push $(IMAGE):$(TAG)
+	gcloud docker -- push $(IMAGE):$(TAG)
 	touch $@
 
 push-legacy: .push-legacy-$(ARCH)
 .push-legacy-$(ARCH): .container-$(ARCH)
 ifeq ($(ARCH),amd64)
-	gcloud docker push $(LEGACY_AMD64_IMAGE):$(TAG)
+	gcloud docker -- push $(LEGACY_AMD64_IMAGE):$(TAG)
 endif
 	touch $@
 
diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile
index 518412f6306..698f19be7a9 100644
--- a/cluster/addons/addon-manager/Makefile
+++ b/cluster/addons/addon-manager/Makefile
@@ -63,11 +63,11 @@ endif
 	docker build -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
 
 push: build
-	gcloud docker push $(IMAGE)-$(ARCH):$(VERSION)
+	gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION)
 ifeq ($(ARCH),amd64)
 	# Backward compatibility. TODO: deprecate this image tag
 	docker tag -f $(IMAGE)-$(ARCH):$(VERSION) $(IMAGE):$(VERSION)
-	gcloud docker push $(IMAGE):$(VERSION)
+	gcloud docker -- push $(IMAGE):$(VERSION)
 endif
 
 clean:
diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Makefile b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
index 40961f42918..1d4a1539443 100755
--- a/cluster/addons/fluentd-elasticsearch/es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/es-image/Makefile
@@ -22,7 +22,7 @@ build:	elasticsearch_logging_discovery
 	docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .
 
 push:
-	gcloud docker push gcr.io/google_containers/elasticsearch:$(TAG)
+	gcloud docker -- push gcr.io/google_containers/elasticsearch:$(TAG)
 
 elasticsearch_logging_discovery:
 	go build elasticsearch_logging_discovery.go
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
index eb5bb954da8..c646d151997 100644
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -17,8 +17,8 @@
 IMAGE = fluentd-elasticsearch
 TAG = 1.19
 
-build:	
+build:
 	docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
 
-push:	
-	gcloud docker --server=gcr.io push gcr.io/google_containers/$(IMAGE):$(TAG)
+push:
+	gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)
diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
index 4033faa8614..1da7e798d46 100755
--- a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
+++ b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
@@ -20,4 +20,4 @@ build:
 	docker build -t gcr.io/google_containers/kibana:$(TAG) .
 
 push:
-	gcloud docker push gcr.io/google_containers/kibana:$(TAG)
+	gcloud docker -- push gcr.io/google_containers/kibana:$(TAG)
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
index 38ce3edc0f2..696d74dada8 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -24,7 +24,7 @@
 # 4. Test etc.
 # 5. Issue PR.
 # 6. When PR is approved make the gcr.io version of the image: make build push
-# 7. Revert the referendes to kubernetes/fluentd-gcp:$(TAG) to gcr.io/google_containers/fluentd-gcp:$(TAG) 
+# 7. Revert the referendes to kubernetes/fluentd-gcp:$(TAG) to gcr.io/google_containers/fluentd-gcp:$(TAG)
 
 .PHONY:	kbuild kpush
 
@@ -47,4 +47,4 @@ build:
 
 
 push:
-	gcloud docker push gcr.io/google_containers/fluentd-gcp:$(TAG)
+	gcloud docker -- push gcr.io/google_containers/fluentd-gcp:$(TAG)
diff --git a/cluster/addons/python-image/Makefile b/cluster/addons/python-image/Makefile
index c47ed861baf..4fa9300f229 100644
--- a/cluster/addons/python-image/Makefile
+++ b/cluster/addons/python-image/Makefile
@@ -21,5 +21,5 @@ build:
 	docker build -t "$(IMAGE):$(VERSION)" .
 
 push:
-	gcloud docker push "$(IMAGE):$(VERSION)"
+	gcloud docker -- push "$(IMAGE):$(VERSION)"
 
diff --git a/cluster/addons/registry/images/Makefile b/cluster/addons/registry/images/Makefile
index 0166870cbb8..26a6b244551 100644
--- a/cluster/addons/registry/images/Makefile
+++ b/cluster/addons/registry/images/Makefile
@@ -21,4 +21,4 @@ build:
 	docker build -t $(REPO):$(TAG) .
 
 push:
-	gcloud docker push $(REPO):$(TAG)
+	gcloud docker -- push $(REPO):$(TAG)
diff --git a/cluster/images/etcd-empty-dir-cleanup/Makefile b/cluster/images/etcd-empty-dir-cleanup/Makefile
index 41f7daa8315..bce85ad63d4 100644
--- a/cluster/images/etcd-empty-dir-cleanup/Makefile
+++ b/cluster/images/etcd-empty-dir-cleanup/Makefile
@@ -29,4 +29,4 @@ build: clean
 	rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
 
 push: build
-	gcloud docker push $(IMAGE):$(TAG)
+	gcloud docker -- push $(IMAGE):$(TAG)
diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index f7e76b406c0..3c2fd2805b2 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -72,7 +72,7 @@ ifeq ($(ARCH),amd64)
 		cp $(TEMP_DIR)/etcdctl $(TEMP_DIR)/etcdctl-$$tag; \
 	done
 else
-	
+
 	# Download etcd in a golang container and cross-compile it statically
 	# For each release create a tmp dir 'etcd_release_tmp_dir' and unpack the release tar there.
 	for tag in $(TAGS); do \
@@ -102,12 +102,12 @@ endif
 	docker build -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
 
 push: build
-	gcloud docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
+	gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
 
 ifeq ($(ARCH),amd64)
 	# Backward compatibility. TODO: deprecate this image tag
 	docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(REGISTRY)/etcd:$(REGISTRY_TAG)
-	gcloud docker push $(REGISTRY)/etcd:$(REGISTRY_TAG)
+	gcloud docker -- push $(REGISTRY)/etcd:$(REGISTRY_TAG)
 endif
 
 all: build
diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile
index 7c1f811480d..a21fc62ab85 100644
--- a/cluster/images/hyperkube/Makefile
+++ b/cluster/images/hyperkube/Makefile
@@ -105,10 +105,10 @@ endif
 	rm -rf "${TEMP_DIR}"
 
 push: build
-	gcloud docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
+	gcloud docker -- push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
 ifeq ($(ARCH),amd64)
 	docker tag -f ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
-	gcloud docker push ${REGISTRY}/hyperkube:${VERSION}
+	gcloud docker -- push ${REGISTRY}/hyperkube:${VERSION}
 endif
 
 .PHONY: all
diff --git a/cluster/images/kube-discovery/Makefile b/cluster/images/kube-discovery/Makefile
index d291f858886..087ec099650 100644
--- a/cluster/images/kube-discovery/Makefile
+++ b/cluster/images/kube-discovery/Makefile
@@ -48,6 +48,6 @@ build:
 	rm -rf "${TEMP_DIR}"
 
 push: build
-	gcloud docker push ${REGISTRY}/kube-discovery-${ARCH}:${VERSION}
+	gcloud docker -- push ${REGISTRY}/kube-discovery-${ARCH}:${VERSION}
 
 .PHONY: all
diff --git a/cluster/images/kubemark/Makefile b/cluster/images/kubemark/Makefile
index afc011729f6..8ed1a6a9dc5 100644
--- a/cluster/images/kubemark/Makefile
+++ b/cluster/images/kubemark/Makefile
@@ -17,6 +17,6 @@
 
 all:
 	docker build -t gcr.io/$(PROJECT)/kubemark .
-	gcloud docker push gcr.io/$(PROJECT)/kubemark
+	gcloud docker -- push gcr.io/$(PROJECT)/kubemark
 
 .PHONY: all
diff --git a/examples/cluster-dns/images/backend/Makefile b/examples/cluster-dns/images/backend/Makefile
index b029931ba42..14e1bcdee57 100644
--- a/examples/cluster-dns/images/backend/Makefile
+++ b/examples/cluster-dns/images/backend/Makefile
@@ -22,6 +22,6 @@ image:
 	docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/$(IMAGE)
+	gcloud docker -- push $(PREFIX)/$(IMAGE)
 
 clean:
diff --git a/examples/cluster-dns/images/frontend/Makefile b/examples/cluster-dns/images/frontend/Makefile
index 5bd4443ab98..ae8847e3dda 100644
--- a/examples/cluster-dns/images/frontend/Makefile
+++ b/examples/cluster-dns/images/frontend/Makefile
@@ -22,6 +22,6 @@ image:
 	docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/$(IMAGE)
+	gcloud docker -- push $(PREFIX)/$(IMAGE)
 
 clean:
diff --git a/examples/explorer/Makefile b/examples/explorer/Makefile
index 36f7494fe3e..28a3b4dd5fa 100644
--- a/examples/explorer/Makefile
+++ b/examples/explorer/Makefile
@@ -24,7 +24,7 @@ container: explorer
 	docker build -t gcr.io/google_containers/explorer:$(TAG) .
 
 push: container
-	gcloud docker push gcr.io/google_containers/explorer:$(TAG)
+	gcloud docker -- push gcr.io/google_containers/explorer:$(TAG)
 
 clean:
 	rm -f explorer
diff --git a/examples/guestbook-go/_src/Makefile b/examples/guestbook-go/_src/Makefile
index e5db478ab00..31c04761f78 100644
--- a/examples/guestbook-go/_src/Makefile
+++ b/examples/guestbook-go/_src/Makefile
@@ -28,10 +28,10 @@ build:
 
 # push the image to an registry
 push:
-	gcloud docker push ${REGISTRY}/guestbook:${VERSION}
-	
+	gcloud docker -- push ${REGISTRY}/guestbook:${VERSION}
+
 # remove previous images and containers
-clean: 
+clean:
 	docker rm -f ${REGISTRY}/guestbook-builder 2> /dev/null || true
 	docker rmi -f ${REGISTRY}/guestbook-builder || true
 	docker rmi -f "${REGISTRY}/guestbook:${VERSION}" || true
diff --git a/examples/kubectl-container/Makefile b/examples/kubectl-container/Makefile
index e3b21a5b293..bcdd62c1f5d 100644
--- a/examples/kubectl-container/Makefile
+++ b/examples/kubectl-container/Makefile
@@ -41,7 +41,7 @@ container:
 
 push: container
 	$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
-	gcloud docker push gcr.io/google_containers/kubectl:$(TAG)
+	gcloud docker -- push gcr.io/google_containers/kubectl:$(TAG)
 
 clean:
 	rm -f kubectl
diff --git a/examples/meteor/README.md b/examples/meteor/README.md
index 94c393afd99..d8873b5b290 100644
--- a/examples/meteor/README.md
+++ b/examples/meteor/README.md
@@ -131,7 +131,7 @@ your app image with your project ID, and push to GCR. Replace
 
 ```
 docker tag my-meteor gcr.io/<project>/my-meteor
-gcloud docker push gcr.io/<project>/my-meteor
+gcloud docker -- push gcr.io/<project>/my-meteor
 ```
 
 Running
diff --git a/examples/storage/cassandra/image/Makefile b/examples/storage/cassandra/image/Makefile
index c016cac2ef2..7cae1f5ef6e 100644
--- a/examples/storage/cassandra/image/Makefile
+++ b/examples/storage/cassandra/image/Makefile
@@ -29,6 +29,6 @@ build: kubernetes-cassandra.jar
 	docker build -t ${PROJECT}/cassandra:${VERSION} .
 
 push: build
-	gcloud docker push ${PROJECT}/cassandra:${VERSION}
+	gcloud docker -- push ${PROJECT}/cassandra:${VERSION}
 
 .PHONY: all build push
diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh
index 2ba3a5d7e38..0e4d9b2fe96 100644
--- a/federation/cluster/common.sh
+++ b/federation/cluster/common.sh
@@ -333,7 +333,7 @@ function push-federation-images {
         kube::log::status "Pushing ${docker_image_tag}"
         if [[ "${FEDERATION_PUSH_REPO_BASE}" == "gcr.io/"* ]]; then
             echo " -> GCR repository detected. Using gcloud"
-            gcloud docker push "${docker_image_tag}"
+            gcloud docker -- push "${docker_image_tag}"
         else
             docker push "${docker_image_tag}"
         fi
diff --git a/federation/develop/develop.sh b/federation/develop/develop.sh
index 717f012aada..59f76211196 100755
--- a/federation/develop/develop.sh
+++ b/federation/develop/develop.sh
@@ -127,7 +127,7 @@ function push() {
   fi
 
   kube::log::status "Pushing hyperkube image to the registry"
-  gcloud docker push "${KUBE_REGISTRY}/hyperkube-amd64:${kube_version}"
+  gcloud docker -- push "${KUBE_REGISTRY}/hyperkube-amd64:${kube_version}"
 
   # Update config after build and push, but before turning up the clusters
   # to ensure the config has the right image version tags.
diff --git a/test/images/clusterapi-tester/Makefile b/test/images/clusterapi-tester/Makefile
index 56ea5271b39..69cf4161717 100644
--- a/test/images/clusterapi-tester/Makefile
+++ b/test/images/clusterapi-tester/Makefile
@@ -25,7 +25,7 @@ container: main
 	docker build -t $(PREFIX):$(TAG) .
 
 push: container
-	gcloud docker push $(PREFIX):$(TAG)
+	gcloud docker -- push $(PREFIX):$(TAG)
 
 clean:
 	rm -f main
diff --git a/test/images/dnsutils/Makefile b/test/images/dnsutils/Makefile
index 2ec14dbf95c..101f55802cc 100644
--- a/test/images/dnsutils/Makefile
+++ b/test/images/dnsutils/Makefile
@@ -22,6 +22,6 @@ image:
 	docker build -t $(PREFIX)/dnsutils .
 
 push: image
-	gcloud docker push $(PREFIX)/dnsutils
+	gcloud docker -- push $(PREFIX)/dnsutils
 
 clean:
diff --git a/test/images/fakegitserver/Makefile b/test/images/fakegitserver/Makefile
index 8fa4e68d881..2e4122a108a 100644
--- a/test/images/fakegitserver/Makefile
+++ b/test/images/fakegitserver/Makefile
@@ -24,7 +24,7 @@ image:
 	docker build -t $(PREFIX)/$(IMAGE):$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/$(IMAGE):$(TAG)
+	gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)
 
 all: push
 
diff --git a/test/images/goproxy/Makefile b/test/images/goproxy/Makefile
index 5e5ab3d79c5..f6ef1f23658 100644
--- a/test/images/goproxy/Makefile
+++ b/test/images/goproxy/Makefile
@@ -24,7 +24,7 @@ image: goproxy
 	docker build -t $(PREFIX)/goproxy:$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/goproxy:$(TAG)
+	gcloud docker -- push $(PREFIX)/goproxy:$(TAG)
 
 clean:
 	rm -f goproxy
diff --git a/test/images/hostexec/Makefile b/test/images/hostexec/Makefile
index f16626824d3..214035a54a5 100644
--- a/test/images/hostexec/Makefile
+++ b/test/images/hostexec/Makefile
@@ -24,7 +24,7 @@ image:
 	docker build -t $(PREFIX)/hostexec:$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/hostexec:$(TAG)
+	gcloud docker -- push $(PREFIX)/hostexec:$(TAG)
 
 clean:
 	rm -f hostexec
diff --git a/test/images/iperf/Makefile b/test/images/iperf/Makefile
index a97de240a8e..b74b139294c 100644
--- a/test/images/iperf/Makefile
+++ b/test/images/iperf/Makefile
@@ -25,7 +25,7 @@ image:
 	docker tag $(PREFIX)/${IMAGE} $(PREFIX)/${IMAGE}:$(TAG) # Add the version tag to the latest image
 
 push: image
-	gcloud docker push $(PREFIX)/${IMAGE} # Push image tagged as latest to repository
-	gcloud docker push $(PREFIX)/${IMAGE}:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
+	gcloud docker -- push $(PREFIX)/${IMAGE} # Push image tagged as latest to repository
+	gcloud docker -- push $(PREFIX)/${IMAGE}:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
 
 clean:
diff --git a/test/images/jessie-dnsutils/Makefile b/test/images/jessie-dnsutils/Makefile
index f89602843f6..ba6e48143e6 100644
--- a/test/images/jessie-dnsutils/Makefile
+++ b/test/images/jessie-dnsutils/Makefile
@@ -22,6 +22,6 @@ image:
 	docker build -t $(PREFIX)/jessie-dnsutils .
 
 push: image
-	gcloud docker push $(PREFIX)/jessie-dnsutils
+	gcloud docker -- push $(PREFIX)/jessie-dnsutils
 
 clean:
diff --git a/test/images/mount-tester-user/Makefile b/test/images/mount-tester-user/Makefile
index aec8d860055..b15f9870602 100644
--- a/test/images/mount-tester-user/Makefile
+++ b/test/images/mount-tester-user/Makefile
@@ -21,6 +21,6 @@ image:
 	sudo docker build -t $(PREFIX)/mounttest-user:$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/mounttest-user:$(TAG)
+	gcloud docker -- push $(PREFIX)/mounttest-user:$(TAG)
 
 clean:
diff --git a/test/images/mount-tester/Makefile b/test/images/mount-tester/Makefile
index 6344abe97d1..be5fd1b19c3 100644
--- a/test/images/mount-tester/Makefile
+++ b/test/images/mount-tester/Makefile
@@ -24,7 +24,7 @@ image: mt
 	sudo docker build -t $(PREFIX)/mounttest:$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/mounttest:$(TAG)
+	gcloud docker -- push $(PREFIX)/mounttest:$(TAG)
 
 clean:
 	rm -f mt
diff --git a/test/images/n-way-http/Makefile b/test/images/n-way-http/Makefile
index de23abd7ff0..207cd6ca8c7 100644
--- a/test/images/n-way-http/Makefile
+++ b/test/images/n-way-http/Makefile
@@ -25,7 +25,7 @@ container: server
 	docker build -t $(PREFIX):$(TAG) .
 
 push: container
-	gcloud docker push $(PREFIX):$(TAG)
+	gcloud docker -- push $(PREFIX):$(TAG)
 
 clean:
 	rm -f server
diff --git a/test/images/netexec/Makefile b/test/images/netexec/Makefile
index 5ff38064774..c699e050797 100644
--- a/test/images/netexec/Makefile
+++ b/test/images/netexec/Makefile
@@ -27,7 +27,7 @@ image: netexec
 	docker build -t $(PREFIX)/netexec:$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/netexec:$(TAG)
+	gcloud docker -- push $(PREFIX)/netexec:$(TAG)
 
 clean:
 	rm -f netexec
diff --git a/test/images/network-tester/Makefile b/test/images/network-tester/Makefile
index 31dfd02c93e..62abcede4f5 100644
--- a/test/images/network-tester/Makefile
+++ b/test/images/network-tester/Makefile
@@ -26,7 +26,7 @@ image: webserver
 	docker build -t $(PREFIX)/nettest:$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/nettest:$(TAG)
+	gcloud docker -- push $(PREFIX)/nettest:$(TAG)
 
 clean:
 	rm -f webserver
diff --git a/test/images/pets/redis/Makefile b/test/images/pets/redis/Makefile
index 32bfc1549cd..277fdb66fe6 100644
--- a/test/images/pets/redis/Makefile
+++ b/test/images/pets/redis/Makefile
@@ -21,7 +21,7 @@ container:
 	docker build -t $(PREFIX):$(TAG) .
 
 push: container
-	gcloud docker push $(PREFIX):$(TAG)
+	gcloud docker -- push $(PREFIX):$(TAG)
 
 clean:
 	docker rmi $(PREFIX):$(TAG)
diff --git a/test/images/pets/zookeeper/Makefile b/test/images/pets/zookeeper/Makefile
index 07528197b06..83b72c6ba38 100644
--- a/test/images/pets/zookeeper/Makefile
+++ b/test/images/pets/zookeeper/Makefile
@@ -21,7 +21,7 @@ container:
 	docker build -t $(PREFIX):$(TAG) .
 
 push: container
-	gcloud docker push $(PREFIX):$(TAG)
+	gcloud docker -- push $(PREFIX):$(TAG)
 
 clean:
 	docker rmi $(PREFIX):$(TAG)
diff --git a/test/images/port-forward-tester/Makefile b/test/images/port-forward-tester/Makefile
index a077ea4f19f..573786d2350 100644
--- a/test/images/port-forward-tester/Makefile
+++ b/test/images/port-forward-tester/Makefile
@@ -24,7 +24,7 @@ image: portforwardtester
 	docker build -t $(PREFIX)/portforwardtester:$(TAG) .
 
 push: image
-	gcloud docker push $(PREFIX)/portforwardtester:$(TAG)
+	gcloud docker -- push $(PREFIX)/portforwardtester:$(TAG)
 
 clean:
 	rm -f portforwardtester
diff --git a/test/images/porter/Makefile b/test/images/porter/Makefile
index 747f1b8b213..fc1fe4c1982 100644
--- a/test/images/porter/Makefile
+++ b/test/images/porter/Makefile
@@ -41,7 +41,7 @@ image:
 
 push:
 	$(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))
-	gcloud docker push $(PREFIX)/porter:$(TAG)
+	gcloud docker -- push $(PREFIX)/porter:$(TAG)
 
 clean:
 	rm -f porter
diff --git a/test/images/resource-consumer/Makefile b/test/images/resource-consumer/Makefile
index 76a2cfcc680..c186843a148 100644
--- a/test/images/resource-consumer/Makefile
+++ b/test/images/resource-consumer/Makefile
@@ -32,8 +32,8 @@ run_container:
 	docker run --publish=8080:8080 $(PREFIX)/resource_consumer:$(TAG)
 
 push:
-	gcloud docker push ${PREFIX}/resource_consumer:${TAG}
-	gcloud docker push ${PREFIX}/resource_consumer/controller:${TAG}
+	gcloud docker -- push ${PREFIX}/resource_consumer:${TAG}
+	gcloud docker -- push ${PREFIX}/resource_consumer/controller:${TAG}
 
 clean:
 	rm -f consumer
diff --git a/test/images/serve_hostname/Makefile b/test/images/serve_hostname/Makefile
index a492b1880c0..fcc8d5db398 100644
--- a/test/images/serve_hostname/Makefile
+++ b/test/images/serve_hostname/Makefile
@@ -90,9 +90,9 @@ container: .container-$(ARCH)
 
 push: .push-$(ARCH)
 .push-$(ARCH): .container-$(ARCH)
-	gcloud docker push $(IMAGE):$(TAG)
+	gcloud docker -- push $(IMAGE):$(TAG)
 	if [ -n "$(TEST_REGISTRY)" ]; then \
-		gcloud docker push $(TEST_IMAGE):$(TAG) ;\
+		gcloud docker -- push $(TEST_IMAGE):$(TAG) ;\
 	fi
 
 clean:
diff --git a/test/images/volumes-tester/ceph/Makefile b/test/images/volumes-tester/ceph/Makefile
index 9333ade68f1..16c47d3259e 100644
--- a/test/images/volumes-tester/ceph/Makefile
+++ b/test/images/volumes-tester/ceph/Makefile
@@ -24,7 +24,7 @@ image:
 	docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG)  # Add the version tag to the latest image
 
 push: image
-	gcloud docker push $(PREFIX)/volume-ceph # Push image tagged as latest to repository
-	gcloud docker push $(PREFIX)/volume-ceph:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
+	gcloud docker -- push $(PREFIX)/volume-ceph # Push image tagged as latest to repository
+	gcloud docker -- push $(PREFIX)/volume-ceph:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
 
 clean:
diff --git a/test/images/volumes-tester/gluster/Makefile b/test/images/volumes-tester/gluster/Makefile
index 8dbb4636735..1d7ecebba0f 100644
--- a/test/images/volumes-tester/gluster/Makefile
+++ b/test/images/volumes-tester/gluster/Makefile
@@ -21,10 +21,10 @@ container: image
 
 image:
 	docker build -t $(PREFIX)/volume-gluster . # Build new image and automatically tag it as latest
-	docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG)  # Add the version tag to the latest image 
+	docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG)  # Add the version tag to the latest image
 
 push: image
-	gcloud docker push $(PREFIX)/volume-gluster # Push image tagged as latest to repository
-	gcloud docker push $(PREFIX)/volume-gluster:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
+	gcloud docker -- push $(PREFIX)/volume-gluster # Push image tagged as latest to repository
+	gcloud docker -- push $(PREFIX)/volume-gluster:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
 
 clean:
diff --git a/test/images/volumes-tester/iscsi/Makefile b/test/images/volumes-tester/iscsi/Makefile
index 353933c28f7..efe128432f6 100644
--- a/test/images/volumes-tester/iscsi/Makefile
+++ b/test/images/volumes-tester/iscsi/Makefile
@@ -34,8 +34,8 @@ block:
 
 push: image
 	# Push image tagged as latest to repository
-	gcloud docker push $(PREFIX)/volume-iscsi
+	gcloud docker -- push $(PREFIX)/volume-iscsi
 	# Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
-	gcloud docker push $(PREFIX)/volume-iscsi:$(TAG)
+	gcloud docker -- push $(PREFIX)/volume-iscsi:$(TAG)
 
 clean:
diff --git a/test/images/volumes-tester/nfs/Makefile b/test/images/volumes-tester/nfs/Makefile
index 5111f019f45..adc7d0ce501 100644
--- a/test/images/volumes-tester/nfs/Makefile
+++ b/test/images/volumes-tester/nfs/Makefile
@@ -24,7 +24,7 @@ image:
 	docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image
 
 push: image
-	gcloud docker push $(PREFIX)/volume-nfs # Push image tagged as latest to repository
-	gcloud docker push $(PREFIX)/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
+	gcloud docker -- push $(PREFIX)/volume-nfs # Push image tagged as latest to repository
+	gcloud docker -- push $(PREFIX)/volume-nfs:$(TAG) # Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
 
 clean:
diff --git a/test/images/volumes-tester/rbd/Makefile b/test/images/volumes-tester/rbd/Makefile
index 97b86dcb42b..43379237517 100644
--- a/test/images/volumes-tester/rbd/Makefile
+++ b/test/images/volumes-tester/rbd/Makefile
@@ -22,7 +22,7 @@ container: image
 image:
 	# Build new image and automatically tag it as latest
 	docker build -t $(PREFIX)/volume-rbd .
-	# Add the version tag to the latest image 
+	# Add the version tag to the latest image
 	docker tag $(PREFIX)/volume-rbd $(PREFIX)/volume-rbd:$(TAG)
 
 block:
@@ -34,8 +34,8 @@ block:
 
 push: image
 	# Push image tagged as latest to repository
-	gcloud docker push $(PREFIX)/volume-rbd
+	gcloud docker -- push $(PREFIX)/volume-rbd
 	# Push version tagged image to repository (since this image is already pushed it will simply create or update version tag)
-	gcloud docker push $(PREFIX)/volume-rbd:$(TAG)
+	gcloud docker -- push $(PREFIX)/volume-rbd:$(TAG)
 
 clean: