diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
index 2aa8ab7a..581f2439 100644
--- a/.github/workflows/build-and-publish.yaml
+++ b/.github/workflows/build-and-publish.yaml
@@ -14,15 +14,15 @@ env:
     REL_IMAGE_CONF=RELATED_IMAGE_API_MANAGER=storageos/api-manager:develop
     RELATED_IMAGE_PORTAL_MANAGER=storageos/portal-manager:develop
     RELATED_IMAGE_CSIV1_EXTERNAL_PROVISIONER=storageos/csi-provisioner:v2.1.1-snapshots-patched
-    RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3=quay.io/k8scsi/csi-attacher:v3.1.0
-    RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=quay.io/k8scsi/csi-resizer:v1.1.0
-    RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=quay.io/k8scsi/csi-snapshotter:v4.0.0
+    RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3=k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
+    RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+    RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
     RELATED_IMAGE_STORAGEOS_INIT=storageos/init:v2.1.3
     RELATED_IMAGE_STORAGEOS_NODE=soegarots/node:v2-main-477
     RELATED_IMAGE_NODE_MANAGER=storageos/node-manager:develop
     RELATED_IMAGE_NODE_GUARD=storageos/node-guard:develop
-    RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=quay.io/k8scsi/csi-node-driver-registrar:v2.1.0
-    RELATED_IMAGE_CSIV1_LIVENESS_PROBE=quay.io/k8scsi/livenessprobe:v2.2.0
+    RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
+    RELATED_IMAGE_CSIV1_LIVENESS_PROBE=registry.k8s.io/sig-storage/livenessprobe:v2.8.0
     RELATED_IMAGE_METRICS_EXPORTER=storageos/metrics-exporter:v0.1.7
 
 jobs:
diff --git a/.github/workflows/develop-image.yaml b/.github/workflows/develop-image.yaml
index 2c963797..74c76406 100644
--- a/.github/workflows/develop-image.yaml
+++ b/.github/workflows/develop-image.yaml
@@ -11,15 +11,15 @@ env:
     REL_IMAGE_CONF=RELATED_IMAGE_API_MANAGER=storageos/api-manager:develop
     RELATED_IMAGE_PORTAL_MANAGER=storageos/portal-manager:develop
     RELATED_IMAGE_CSIV1_EXTERNAL_PROVISIONER=storageos/csi-provisioner:v2.1.1-snapshots-patched
-    RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3=quay.io/k8scsi/csi-attacher:v3.1.0
-    RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=quay.io/k8scsi/csi-resizer:v1.1.0
-    RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=quay.io/k8scsi/csi-snapshotter:v4.0.0
+    RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3=k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
+    RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+    RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
     RELATED_IMAGE_STORAGEOS_INIT=storageos/init:v2.1.3
     RELATED_IMAGE_STORAGEOS_NODE=soegarots/node:v2-main-477
     RELATED_IMAGE_NODE_MANAGER=storageos/node-manager:develop
     RELATED_IMAGE_NODE_GUARD=storageos/node-guard:develop
-    RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=quay.io/k8scsi/csi-node-driver-registrar:v2.1.0
-    RELATED_IMAGE_CSIV1_LIVENESS_PROBE=quay.io/k8scsi/livenessprobe:v2.2.0
+    RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
+    RELATED_IMAGE_CSIV1_LIVENESS_PROBE=registry.k8s.io/sig-storage/livenessprobe:v2.8.0
     RELATED_IMAGE_METRICS_EXPORTER=storageos/metrics-exporter:v0.1.7
 
 jobs:
diff --git a/Makefile b/Makefile
index 664d8f26..57375028 100644
--- a/Makefile
+++ b/Makefile
@@ -43,17 +43,17 @@ PORTAL_MANAGER_VERSION ?= develop
 PORTAL_MANAGER_IMAGE ?= storageos/portal-manager:$(PORTAL_MANAGER_VERSION)
 PORTAL_MANAGER_MANIFESTS_IMAGE ?= storageos/portal-manager-manifests
 EXTERNAL_PROVISIONER_IMAGE ?= storageos/csi-provisioner:v2.1.1-snapshots-patched
-EXTERNAL_ATTACHER_IMAGE ?= quay.io/k8scsi/csi-attacher:v3.1.0
-EXTERNAL_RESIZER_IMAGE ?= quay.io/k8scsi/csi-resizer:v1.1.0
-EXTERNAL_SNAPSHOTTER_IMAGE ?= quay.io/k8scsi/csi-snapshotter:v4.0.0
+EXTERNAL_ATTACHER_IMAGE ?= k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
+EXTERNAL_RESIZER_IMAGE ?= k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+EXTERNAL_SNAPSHOTTER_IMAGE ?= k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
 INIT_IMAGE ?= storageos/init:v2.1.3
-NODE_IMAGE ?= soegarots/node:v2-main-477
+NODE_IMAGE ?= storageos/node:v2.9.0
 NODE_MANAGER_VERSION ?= develop
 NODE_MANAGER_IMAGE ?= storageos/node-manager:$(NODE_MANAGER_VERSION)
 NODE_MANAGER_MANIFESTS_IMAGE ?= storageos/node-manager-manifests
 NODE_GUARD_IMAGE ?= storageos/node-guard:develop
-NODE_DRIVER_REG_IMAGE ?= quay.io/k8scsi/csi-node-driver-registrar:v2.1.0
-LIVENESS_PROBE_IMAGE ?= quay.io/k8scsi/livenessprobe:v2.2.0
+NODE_DRIVER_REG_IMAGE ?= registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
+LIVENESS_PROBE_IMAGE ?= registry.k8s.io/sig-storage/livenessprobe:v2.8.0
 METRICS_EXPORTER_VERSION ?= v0.1.7
 METRICS_EXPORTER_IMAGE ?= storageos/metrics-exporter:$(METRICS_EXPORTER_VERSION)
 METRICS_EXPORTER_MANIFESTS_URL ?= https://github.com/ondat/metrics-exporter/releases/download/$(METRICS_EXPORTER_VERSION)/bundle.yaml
diff --git a/bundle/manifests/storageos-related-images_v1_configmap.yaml b/bundle/manifests/storageos-related-images_v1_configmap.yaml
index f6c4a6de..1929e468 100644
--- a/bundle/manifests/storageos-related-images_v1_configmap.yaml
+++ b/bundle/manifests/storageos-related-images_v1_configmap.yaml
@@ -1,18 +1,18 @@
 apiVersion: v1
 data:
   RELATED_IMAGE_API_MANAGER: storageos/api-manager:develop
-  RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3: quay.io/k8scsi/csi-attacher:v3.1.0
+  RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
   RELATED_IMAGE_CSIV1_EXTERNAL_PROVISIONER: storageos/csi-provisioner:v2.1.1-snapshots-patched
-  RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER: quay.io/k8scsi/csi-resizer:v1.1.0
-  RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER: quay.io/k8scsi/csi-snapshotter:v4.0.0
-  RELATED_IMAGE_CSIV1_LIVENESS_PROBE: quay.io/k8scsi/livenessprobe:v2.2.0
-  RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR: quay.io/k8scsi/csi-node-driver-registrar:v2.1.0
+  RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER: k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+  RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
+  RELATED_IMAGE_CSIV1_LIVENESS_PROBE: registry.k8s.io/sig-storage/livenessprobe:v2.8.0
+  RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
   RELATED_IMAGE_METRICS_EXPORTER: storageos/metrics-exporter:v0.1.7
   RELATED_IMAGE_NODE_GUARD: storageos/node-guard:develop
   RELATED_IMAGE_NODE_MANAGER: storageos/node-manager:develop
   RELATED_IMAGE_PORTAL_MANAGER: storageos/portal-manager:develop
   RELATED_IMAGE_STORAGEOS_INIT: storageos/init:v2.1.3
-  RELATED_IMAGE_STORAGEOS_NODE: soegarots/node:v2-main-477
+  RELATED_IMAGE_STORAGEOS_NODE: storageos/node:v2.9.0
 kind: ConfigMap
 metadata:
   labels:
diff --git a/config/manager/related_images_config.yaml b/config/manager/related_images_config.yaml
index 30ca9a4f..2a0746cf 100644
--- a/config/manager/related_images_config.yaml
+++ b/config/manager/related_images_config.yaml
@@ -1,13 +1,13 @@
 RELATED_IMAGE_API_MANAGER=storageos/api-manager:develop
 RELATED_IMAGE_PORTAL_MANAGER=storageos/portal-manager:develop
 RELATED_IMAGE_CSIV1_EXTERNAL_PROVISIONER=storageos/csi-provisioner:v2.1.1-snapshots-patched
-RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3=quay.io/k8scsi/csi-attacher:v3.1.0
-RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=quay.io/k8scsi/csi-resizer:v1.1.0
-RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=quay.io/k8scsi/csi-snapshotter:v4.0.0
+RELATED_IMAGE_CSIV1_EXTERNAL_ATTACHER_V3=k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
+RELATED_IMAGE_CSIV1_EXTERNAL_RESIZER=k8s.gcr.io/sig-storage/csi-resizer:v1.6.0
+RELATED_IMAGE_CSIV1_EXTERNAL_SNAPSHOTTER=k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1
 RELATED_IMAGE_STORAGEOS_INIT=storageos/init:v2.1.3
-RELATED_IMAGE_STORAGEOS_NODE=soegarots/node:v2-main-477
+RELATED_IMAGE_STORAGEOS_NODE=storageos/node:v2.9.0
 RELATED_IMAGE_NODE_MANAGER=storageos/node-manager:develop
 RELATED_IMAGE_NODE_GUARD=storageos/node-guard:develop
-RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=quay.io/k8scsi/csi-node-driver-registrar:v2.1.0
-RELATED_IMAGE_CSIV1_LIVENESS_PROBE=quay.io/k8scsi/livenessprobe:v2.2.0
+RELATED_IMAGE_CSIV1_NODE_DRIVER_REGISTRAR=registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
+RELATED_IMAGE_CSIV1_LIVENESS_PROBE=registry.k8s.io/sig-storage/livenessprobe:v2.8.0
 RELATED_IMAGE_METRICS_EXPORTER=storageos/metrics-exporter:v0.1.7