diff --git a/Dockerfile b/Dockerfile
index 307f1d2d..fed18b88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM k8s.gcr.io/build-image/debian-base:bullseye-v1.2.0
+FROM registry.k8s.io/build-image/debian-base:bullseye-v1.2.0
 
 ARG ARCH
 ARG binary=./bin/${ARCH}/nfsplugin
diff --git a/charts/README.md b/charts/README.md
index ee7772cc..34d75ce7 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -41,16 +41,16 @@ The following table lists the configurable parameters of the latest NFS CSI Driv
 | `feature.enableFSGroupPolicy`                     | enable `fsGroupPolicy` on a k8s 1.20+ cluster              | `true`                      |
 | `feature.enableInlineVolume`                      | enable inline volume                     | `false`                      |
 | `kubeletDir`                                      | alternative kubelet directory                              | `/var/lib/kubelet`                                                  |
-| `image.nfs.repository`                            | csi-driver-nfs image                                       | `k8s.gcr.io/sig-storage/nfsplugin`                          |
+| `image.nfs.repository`                            | csi-driver-nfs image                                       | `registry.k8s.io/sig-storage/nfsplugin`                          |
 | `image.nfs.tag`                                   | csi-driver-nfs image tag                                   | `latest`                                                |
 | `image.nfs.pullPolicy`                            | csi-driver-nfs image pull policy                           | `IfNotPresent`                                                      |
-| `image.csiProvisioner.repository`                 | csi-provisioner docker image                               | `k8s.gcr.io/sig-storage/csi-provisioner`                            |
+| `image.csiProvisioner.repository`                 | csi-provisioner docker image                               | `registry.k8s.io/sig-storage/csi-provisioner`                            |
 | `image.csiProvisioner.tag`                        | csi-provisioner docker image tag                           | `v3.1.0`                                                            |
 | `image.csiProvisioner.pullPolicy`                 | csi-provisioner image pull policy                          | `IfNotPresent`                                                      |
-| `image.livenessProbe.repository`                  | liveness-probe docker image                                | `k8s.gcr.io/sig-storage/livenessprobe`                              |
+| `image.livenessProbe.repository`                  | liveness-probe docker image                                | `registry.k8s.io/sig-storage/livenessprobe`                              |
 | `image.livenessProbe.tag`                         | liveness-probe docker image tag                            | `v2.5.0`                                                            |
 | `image.livenessProbe.pullPolicy`                  | liveness-probe image pull policy                           | `IfNotPresent`                                                      |
-| `image.nodeDriverRegistrar.repository`            | csi-node-driver-registrar docker image                     | `k8s.gcr.io/sig-storage/csi-node-driver-registrar`                  |
+| `image.nodeDriverRegistrar.repository`            | csi-node-driver-registrar docker image                     | `registry.k8s.io/sig-storage/csi-node-driver-registrar`                  |
 | `image.nodeDriverRegistrar.tag`                   | csi-node-driver-registrar docker image tag                 | `v2.4.0`                                                            |
 | `image.nodeDriverRegistrar.pullPolicy`            | csi-node-driver-registrar image pull policy                | `IfNotPresent`                                                      |
 | `imagePullSecrets`                                | Specify docker-registry secret names as an array           | [] (does not add image pull secrets to deployed pods)                                                           |
diff --git a/charts/latest/csi-driver-nfs-v3.2.0.tgz b/charts/latest/csi-driver-nfs-v3.2.0.tgz
index 5b26eb48..975b7f6a 100644
Binary files a/charts/latest/csi-driver-nfs-v3.2.0.tgz and b/charts/latest/csi-driver-nfs-v3.2.0.tgz differ
diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml
index 1898d98b..4039decc 100755
--- a/charts/latest/csi-driver-nfs/values.yaml
+++ b/charts/latest/csi-driver-nfs/values.yaml
@@ -5,15 +5,15 @@ image:
         tag: canary
         pullPolicy: IfNotPresent
     csiProvisioner:
-        repository: k8s.gcr.io/sig-storage/csi-provisioner
+        repository: registry.k8s.io/sig-storage/csi-provisioner
         tag: v3.1.0
         pullPolicy: IfNotPresent
     livenessProbe:
-        repository: k8s.gcr.io/sig-storage/livenessprobe
+        repository: registry.k8s.io/sig-storage/livenessprobe
         tag: v2.5.0
         pullPolicy: IfNotPresent
     nodeDriverRegistrar:
-        repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+        repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
         tag: v2.4.0
         pullPolicy: IfNotPresent
 
diff --git a/charts/v2.0.0/csi-driver-nfs-v2.0.0.tgz b/charts/v2.0.0/csi-driver-nfs-v2.0.0.tgz
index 1ead6fa8..ffdcb96e 100644
Binary files a/charts/v2.0.0/csi-driver-nfs-v2.0.0.tgz and b/charts/v2.0.0/csi-driver-nfs-v2.0.0.tgz differ
diff --git a/charts/v2.0.0/csi-driver-nfs/values.yaml b/charts/v2.0.0/csi-driver-nfs/values.yaml
index 6483ec30..4d7b98e5 100644
--- a/charts/v2.0.0/csi-driver-nfs/values.yaml
+++ b/charts/v2.0.0/csi-driver-nfs/values.yaml
@@ -4,15 +4,15 @@ image:
         tag: v2.0.0
         pullPolicy:   IfNotPresent
     csiProvisioner:
-        repository: k8s.gcr.io/sig-storage/csi-provisioner
+        repository: registry.k8s.io/sig-storage/csi-provisioner
         tag: v2.0.4
         pullPolicy: IfNotPresent
     livenessProbe:
-        repository: k8s.gcr.io/sig-storage/livenessprobe
+        repository: registry.k8s.io/sig-storage/livenessprobe
         tag: v2.1.0
         pullPolicy: IfNotPresent
     nodeDriverRegistrar:
-        repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+        repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
         tag: v2.0.1
         pullPolicy: IfNotPresent
 serviceAccount:
diff --git a/charts/v3.0.0/csi-driver-nfs-v3.0.0.tgz b/charts/v3.0.0/csi-driver-nfs-v3.0.0.tgz
index ff250adc..9f37fd9d 100644
Binary files a/charts/v3.0.0/csi-driver-nfs-v3.0.0.tgz and b/charts/v3.0.0/csi-driver-nfs-v3.0.0.tgz differ
diff --git a/charts/v3.0.0/csi-driver-nfs/values.yaml b/charts/v3.0.0/csi-driver-nfs/values.yaml
index aaa8f9f2..e63c9717 100755
--- a/charts/v3.0.0/csi-driver-nfs/values.yaml
+++ b/charts/v3.0.0/csi-driver-nfs/values.yaml
@@ -1,18 +1,18 @@
 image:
     nfs:
-        repository: k8s.gcr.io/sig-storage/nfsplugin
+        repository: registry.k8s.io/sig-storage/nfsplugin
         tag: v3.0.0
         pullPolicy: IfNotPresent
     csiProvisioner:
-        repository: k8s.gcr.io/sig-storage/csi-provisioner
+        repository: registry.k8s.io/sig-storage/csi-provisioner
         tag: v2.2.2
         pullPolicy: IfNotPresent
     livenessProbe:
-        repository: k8s.gcr.io/sig-storage/livenessprobe
+        repository: registry.k8s.io/sig-storage/livenessprobe
         tag: v2.5.0
         pullPolicy: IfNotPresent
     nodeDriverRegistrar:
-        repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+        repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
         tag: v2.4.0
         pullPolicy: IfNotPresent
 
diff --git a/charts/v3.1.0/csi-driver-nfs-v3.1.0.tgz b/charts/v3.1.0/csi-driver-nfs-v3.1.0.tgz
index e7e92092..db8f10bc 100644
Binary files a/charts/v3.1.0/csi-driver-nfs-v3.1.0.tgz and b/charts/v3.1.0/csi-driver-nfs-v3.1.0.tgz differ
diff --git a/charts/v3.1.0/csi-driver-nfs/values.yaml b/charts/v3.1.0/csi-driver-nfs/values.yaml
index 3e276868..7b51b702 100644
--- a/charts/v3.1.0/csi-driver-nfs/values.yaml
+++ b/charts/v3.1.0/csi-driver-nfs/values.yaml
@@ -1,18 +1,18 @@
 image:
     nfs:
-        repository: k8s.gcr.io/sig-storage/nfsplugin
+        repository: registry.k8s.io/sig-storage/nfsplugin
         tag: v3.1.0
         pullPolicy: IfNotPresent
     csiProvisioner:
-        repository: k8s.gcr.io/sig-storage/csi-provisioner
+        repository: registry.k8s.io/sig-storage/csi-provisioner
         tag: v2.2.2
         pullPolicy: IfNotPresent
     livenessProbe:
-        repository: k8s.gcr.io/sig-storage/livenessprobe
+        repository: registry.k8s.io/sig-storage/livenessprobe
         tag: v2.5.0
         pullPolicy: IfNotPresent
     nodeDriverRegistrar:
-        repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+        repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
         tag: v2.4.0
         pullPolicy: IfNotPresent
 
diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml
index 83319aac..eb282a20 100644
--- a/deploy/csi-nfs-controller.yaml
+++ b/deploy/csi-nfs-controller.yaml
@@ -32,7 +32,7 @@ spec:
           effect: "NoSchedule"
       containers:
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0
+          image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0
           args:
             - "-v=2"
             - "--csi-address=$(ADDRESS)"
@@ -51,7 +51,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml
index 054af976..86f72444 100644
--- a/deploy/csi-nfs-node.yaml
+++ b/deploy/csi-nfs-node.yaml
@@ -25,7 +25,7 @@ spec:
         - operator: "Exists"
       containers:
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
@@ -41,7 +41,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.4.0
           args:
             - --v=2
             - --csi-address=/csi/csi.sock
diff --git a/deploy/v3.0.0/csi-nfs-controller.yaml b/deploy/v3.0.0/csi-nfs-controller.yaml
index 88b9686b..46e7a2be 100644
--- a/deploy/v3.0.0/csi-nfs-controller.yaml
+++ b/deploy/v3.0.0/csi-nfs-controller.yaml
@@ -29,7 +29,7 @@ spec:
           effect: "NoSchedule"
       containers:
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+          image: registry.k8s.io/sig-storage/csi-provisioner:v2.2.2
           args:
             - "-v=2"
             - "--csi-address=$(ADDRESS)"
@@ -48,7 +48,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
@@ -65,7 +65,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: nfs
-          image: k8s.gcr.io/sig-storage/nfsplugin:v3.0.0
+          image: registry.k8s.io/sig-storage/nfsplugin:v3.0.0
           securityContext:
             privileged: true
             capabilities:
diff --git a/deploy/v3.0.0/csi-nfs-node.yaml b/deploy/v3.0.0/csi-nfs-node.yaml
index eee756d9..1aeb4815 100644
--- a/deploy/v3.0.0/csi-nfs-node.yaml
+++ b/deploy/v3.0.0/csi-nfs-node.yaml
@@ -27,7 +27,7 @@ spec:
         - operator: "Exists"
       containers:
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
@@ -44,7 +44,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.4.0
           args:
             - --v=2
             - --csi-address=/csi/csi.sock
@@ -82,7 +82,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: k8s.gcr.io/sig-storage/nfsplugin:v3.0.0
+          image: registry.k8s.io/sig-storage/nfsplugin:v3.0.0
           args:
             - "-v=5"
             - "--nodeid=$(NODE_ID)"
diff --git a/deploy/v3.1.0/csi-nfs-controller.yaml b/deploy/v3.1.0/csi-nfs-controller.yaml
index d7dbee54..00d0cf6d 100644
--- a/deploy/v3.1.0/csi-nfs-controller.yaml
+++ b/deploy/v3.1.0/csi-nfs-controller.yaml
@@ -29,7 +29,7 @@ spec:
           effect: "NoSchedule"
       containers:
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
+          image: registry.k8s.io/sig-storage/csi-provisioner:v2.2.2
           args:
             - "-v=2"
             - "--csi-address=$(ADDRESS)"
@@ -47,7 +47,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
@@ -63,7 +63,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: nfs
-          image: k8s.gcr.io/sig-storage/nfsplugin:v3.1.0
+          image: registry.k8s.io/sig-storage/nfsplugin:v3.1.0
           securityContext:
             privileged: true
             capabilities:
diff --git a/deploy/v3.1.0/csi-nfs-node.yaml b/deploy/v3.1.0/csi-nfs-node.yaml
index f76469fd..848032ca 100644
--- a/deploy/v3.1.0/csi-nfs-node.yaml
+++ b/deploy/v3.1.0/csi-nfs-node.yaml
@@ -27,7 +27,7 @@ spec:
         - operator: "Exists"
       containers:
         - name: liveness-probe
-          image: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.5.0
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
@@ -43,7 +43,7 @@ spec:
               cpu: 10m
               memory: 20Mi
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.4.0
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.4.0
           args:
             - --v=2
             - --csi-address=/csi/csi.sock
@@ -80,7 +80,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: k8s.gcr.io/sig-storage/nfsplugin:v3.1.0
+          image: registry.k8s.io/sig-storage/nfsplugin:v3.1.0
           args:
             - "-v=5"
             - "--nodeid=$(NODE_ID)"