diff --git a/Makefile b/Makefile
index 2dd9c57..a8640cf 100644
--- a/Makefile
+++ b/Makefile
@@ -37,13 +37,13 @@ uninstall: manifests
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests
-	cd config/controller && kustomize edit set image controller=ghcr.io/alexellis/registry-creds-controller:$(TAG)
+	cd config/controller && kustomize edit set image controller=ghcr.io/alexellis/registry-creds:$(TAG)
 	kustomize build config/default | kubectl apply -f -
 
 .PHONY: shrinkwrap
 shrinkwrap:
 	cd config/default && \
-	kustomize edit set image ghcr.io/alexellis/registry-creds-controller:$(TAG) && \
+	kustomize edit set image ghcr.io/alexellis/registry-creds:$(TAG) && \
 	kustomize build > ../../manifest.yaml
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
@@ -66,7 +66,7 @@ docker-build:
 	@docker buildx create --use --name=multiarch --node=multiarch && \
 	docker buildx build \
 		--output "type=docker,push=false" \
-		--tag alexellis2/registry-creds-controller:$(TAG) \
+		--tag alexellis2registry-creds:$(TAG) \
 		.
 
 .PHONY: docker-publish # Push the docker image to the remote registry
@@ -75,7 +75,7 @@ docker-publish:
 	docker buildx build \
 		--platform linux/amd64,linux/arm/v7,linux/arm64 \
 		--output "type=image,push=true" \
-		--tag alexellis2/registry-creds-controller:$(TAG) .
+		--tag alexellis2registry-creds:$(TAG) .
 
 # find or download controller-gen
 # download controller-gen if necessary
diff --git a/config/controller/controller.yaml b/config/controller/controller.yaml
index 576c6f4..5a852df 100644
--- a/config/controller/controller.yaml
+++ b/config/controller/controller.yaml
@@ -27,7 +27,7 @@ spec:
         - /controller
         args:
         - --enable-leader-election
-        image: ghcr.io/alexellis/registry-creds-controller:0.2.0
+        image: ghcr.io/alexellis/registry-creds:0.2.0
         name: controller
         imagePullPolicy: IfNotPresent
         resources:
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 8f4be47..1146549 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -11,5 +11,7 @@ resources:
 - ../rbac
 - ../controller
 images:
+- name: ghcr.io/alexellis/registry-creds
+  newTag: 0.2.2
 - name: ghcr.io/alexellis/registry-creds-controller
   newTag: 0.2.2
diff --git a/manifest.yaml b/manifest.yaml
index 380c1dc..ecdb795 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -229,7 +229,7 @@ spec:
         - --enable-leader-election
         command:
         - /controller
-        image: ghcr.io/alexellis/registry-creds-controller:0.2.2
+        image: ghcr.io/alexellis/registry-creds:0.2.2
         imagePullPolicy: IfNotPresent
         name: controller
         resources: