diff --git a/Makefile b/Makefile
index e5f72454a..9f9663940 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ ENVSUBST := $(abspath $(TOOLS_BIN_DIR)/envsubst)
 
 # Define Docker related variables. Releases should modify and double check these vars.
 REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
-PROD_REGISTRY ?= k8s.gcr.io/cluster-api
+PROD_REGISTRY ?= registry.k8s.io/cluster-api
 
 STAGING_REGISTRY ?= gcr.io/k8s-staging-cluster-api
 STAGING_BUCKET ?= artifacts.k8s-staging-cluster-api.appspot.com
diff --git a/internal/controllers/component_customizer_test.go b/internal/controllers/component_customizer_test.go
index aed404429..09e3cff73 100644
--- a/internal/controllers/component_customizer_test.go
+++ b/internal/controllers/component_customizer_test.go
@@ -49,7 +49,7 @@ func TestCustomizeDeployment(t *testing.T) {
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{{
 						Name:  "manager",
-						Image: "k8s.gcr.io/a-manager:1.6.2",
+						Image: "registry.k8s.io/a-manager:1.6.2",
 						Env: []corev1.EnvVar{
 							{
 								Name:  "test1",
@@ -451,7 +451,7 @@ func TestCustomizeDeployment(t *testing.T) {
 							Containers: []corev1.Container{
 								{
 									Name:  "manager",
-									Image: "k8s.gcr.io/a-manager:1.6.2",
+									Image: "registry.k8s.io/a-manager:1.6.2",
 									Env: []corev1.EnvVar{
 										{
 											Name:  "test1",