diff --git a/hack/generate-yaml.sh b/hack/generate-yaml.sh
index c69b4f46570e..eaed49d7d443 100755
--- a/hack/generate-yaml.sh
+++ b/hack/generate-yaml.sh
@@ -28,7 +28,7 @@ TPL_DIR=./cmd/clusterctl/examples/vsphere
 OVERWRITE=
 CLUSTER_NAME="${CLUSTER_NAME:-capv-mgmt-example}"
 ENV_VAR_REQ=':?required'
-CAPV_MANAGER_IMAGE="${CAPV_MANAGER_IMAGE:-gcr.io/cnx-cluster-api/vsphere-cluster-api-provider:latest}"
+CAPV_MANAGER_IMAGE="${CAPV_MANAGER_IMAGE:-gcr.io/cluster-api-provider-vsphere/ci/manager:latest}"
 
 usage() {
   cat <<EOF
diff --git a/hack/tools/generate-yaml/Dockerfile b/hack/tools/generate-yaml/Dockerfile
index 002871cad319..951db15e037b 100644
--- a/hack/tools/generate-yaml/Dockerfile
+++ b/hack/tools/generate-yaml/Dockerfile
@@ -51,7 +51,7 @@ COPY ./cmd/clusterctl/examples/vsphere/*.template ./cmd/clusterctl/examples/vsph
 
 # This build arg specifies the value of the -m flag for generate-yaml.sh, the
 # CAPV manager image inserted into the generated provider components.
-ARG CAPV_MANAGER_IMAGE=gcr.io/cnx-cluster-api/vsphere-cluster-api-provider:latest
+ARG CAPV_MANAGER_IMAGE=gcr.io/cluster-api-provider-vsphere/ci/manager:latest
 ENV CAPV_MANAGER_IMAGE=${CAPV_MANAGER_IMAGE}
 
 # The YAML is always written to the /out directory. Mount the volumes there.