diff --git a/Makefile b/Makefile
index 165c5fe43d..383da1732d 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ SHA512SUM=$(shell command -v sha512sum || echo "shasum -a 512")
 GVISOR_TAG ?= latest
 
 # auto-pause-hook tag to push changes to
-AUTOPAUSE_HOOK_TAG ?= 1.13
+AUTOPAUSE_HOOK_TAG ?= v0.0.2
 
 # prow-test tag to push changes to
 PROW_TEST_TAG ?= v0.0.1
@@ -874,12 +874,12 @@ deploy/addons/auto-pause/auto-pause-hook: $(SOURCE_GENERATED) ## Build auto-paus
 
 .PHONY: auto-pause-hook-image
 auto-pause-hook-image: deploy/addons/auto-pause/auto-pause-hook ## Build docker image for auto-pause hook
-	docker build -t docker.io/azhao155/auto-pause-hook:$(AUTOPAUSE_HOOK_TAG) ./deploy/addons/auto-pause
+	docker build -t $(REGISTRY)/auto-pause-hook:$(AUTOPAUSE_HOOK_TAG) ./deploy/addons/auto-pause
 
 .PHONY: push-auto-pause-hook-image
 push-auto-pause-hook-image: auto-pause-hook-image
-	docker login docker.io/azhao155
-	$(MAKE) push-docker IMAGE=docker.io/azhao155/auto-pause-hook:$(AUTOPAUSE_HOOK_TAG)
+	docker login gcr.io/k8s-minikube
+	$(MAKE) push-docker IMAGE=$(REGISTRY)/auto-pause-hook:$(AUTOPAUSE_HOOK_TAG)
 
 .PHONY: prow-test-image
 prow-test-image:
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index 182a42bb2c..af3ac66422 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -105,9 +105,9 @@ var Addons = map[string]*Addon{
 
 		// GuestPersistentDir
 	}, false, "auto-pause", map[string]string{
-		"AutoPauseHook": "azhao155/auto-pause-hook:1.13",
+		"AutoPauseHook": "k8s-minikube/auto-pause-hook:v0.0.2@sha256:c76be418df5ca9c66d0d11c2c68461acbf4072c1cdfc17e64729c5ef4d5a4128",
 	}, map[string]string{
-		"AutoPauseHook": "docker.io",
+		"AutoPauseHook": "gcr.io",
 	}),
 	"dashboard": NewAddon([]*BinAsset{
 		// We want to create the kubernetes-dashboard ns first so that every subsequent object can be created