diff --git a/Makefile b/Makefile
index 71928232..b04d139b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 include .env
 BINARY := oauth2_proxy
-VERSION := $(shell git describe --always --long --dirty --tags 2>/dev/null || echo "undefined")
+VERSION := $(shell git describe --always --dirty --tags 2>/dev/null || echo "undefined")
 .NOTPARALLEL:
 
 .PHONY: all
@@ -47,17 +47,31 @@ $(BINARY):
 
 .PHONY: docker
 docker:
-	docker build -f Dockerfile -t pusher/oauth2_proxy:latest .
+	docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:latest .
 
 .PHONY: docker-all
 docker-all: docker
-	docker build -f Dockerfile -t pusher/oauth2_proxy:latest-amd64 .
-	docker build -f Dockerfile -t pusher/oauth2_proxy:${VERSION} .
-	docker build -f Dockerfile -t pusher/oauth2_proxy:${VERSION}-amd64 .
-	docker build -f Dockerfile.arm64 -t pusher/oauth2_proxy:latest-arm64 .
-	docker build -f Dockerfile.arm64 -t pusher/oauth2_proxy:${VERSION}-arm64 .
-	docker build -f Dockerfile.armv6 -t pusher/oauth2_proxy:latest-armv6 .
-	docker build -f Dockerfile.armv6 -t pusher/oauth2_proxy:${VERSION}-armv6 .
+	docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:latest-amd64 .
+	docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:${VERSION} .
+	docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:${VERSION}-amd64 .
+	docker build -f Dockerfile.arm64 -t quay.io/pusher/oauth2_proxy:latest-arm64 .
+	docker build -f Dockerfile.arm64 -t quay.io/pusher/oauth2_proxy:${VERSION}-arm64 .
+	docker build -f Dockerfile.armv6 -t quay.io/pusher/oauth2_proxy:latest-armv6 .
+	docker build -f Dockerfile.armv6 -t quay.io/pusher/oauth2_proxy:${VERSION}-armv6 .
+
+.PHONY: docker-push
+docker-push:
+	docker push quay.io/pusher/oauth2_proxy:latest
+
+.PHONY: docker-push-all
+docker-push-all: docker-push
+	docker push quay.io/pusher/oauth2_proxy:latest-amd64
+	docker push quay.io/pusher/oauth2_proxy:${VERSION}
+	docker push quay.io/pusher/oauth2_proxy:${VERSION}-amd64
+	docker push quay.io/pusher/oauth2_proxy:latest-arm64
+	docker push quay.io/pusher/oauth2_proxy:${VERSION}-arm64
+	docker push quay.io/pusher/oauth2_proxy:latest-armv6
+	docker push quay.io/pusher/oauth2_proxy:${VERSION}-armv6
 
 .PHONY: test
 test: dep lint