diff --git a/k8s.gcr.io/images/k8s-staging-csi/OWNERS b/k8s.gcr.io/images/k8s-staging-csi/OWNERS
deleted file mode 100644
index 73f0ee6b0d4f..000000000000
--- a/k8s.gcr.io/images/k8s-staging-csi/OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-# See the OWNERS docs at https://go.k8s.io/owners
-
-# Current set of people in sig-storage-leads from
-# https://github.com/kubernetes/community/blob/master/OWNERS_ALIASES.
-approvers:
-- jsafrane
-- msau42
-- saad-ali
-- xing-yang
diff --git a/k8s.gcr.io/images/k8s-staging-csi/images.yaml b/k8s.gcr.io/images/k8s-staging-csi/images.yaml
deleted file mode 100644
index a7555715ca5f..000000000000
--- a/k8s.gcr.io/images/k8s-staging-csi/images.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- name: csi-attacher
-  dmap:
-    "sha256:2ffa647e8107cfd39e5f464e738dce014c9f5e51b108da36c3ab621048d0bbab": [ "v2.2.0" ]
-- name: csi-node-driver-registrar
-  dmap:
-    "sha256:9622c6a6dac7499a055a382930f4de82905a3c5735c0753f7094115c9c871309": [ "v1.3.0" ]
-    "sha256:273175c272162d480d06849e09e6e3cdb0245239e3a82df6630df3bc059c6571": [ "v1.2.0" ]
-- name: csi-provisioner
-  dmap:
-    "sha256:78e3393f5fd5ff6c1e5dada2478cfa456fb7164929e573cf9a87bf6532730679": [ "v1.6.0" ]
-- name: csi-resizer
-  dmap:
-    "sha256:6c6a0332693a7c456378f6abd2bb40611826c1e1a733cadbdae2daab3125b71c": [ "v0.5.0" ]
-    "sha256:43195976fb9f94d943f5dd9d58b8afa543be22d09a1165e8a489b7dfe22c657a": [ "v0.4.0" ]
-- name: csi-snapshotter
-  dmap:
-    "sha256:35ead85dd09aa8cc612fdb598d4e0e2f048bef816f1b74df5eeab67cd21b10aa": [ "v2.1.0" ]
-    "sha256:1530db9fd380ecee86b48a7b3540568c46adb5a64b7fe718c51d9260c4834fd8": [ "v2.0.1" ]
-- name: hostpathplugin
-  dmap:
-- name: livenessprobe
-  dmap:
-    "sha256:f8cec70adc74897ddde5da4f1da0209a497370eaf657566e2b36bc5f0f3ccbd7": [ "v1.1.0" ]
-- name: mock-driver
-  dmap:
-    "sha256:0b4273abac4c241fa3d70aaf52b0d79a133d2737081f4a5c5dea4949f6c45dc3": [ "v3.1.0" ]
-    "sha256:e7c5d268c1f83d423afc6e6d84aec6d3a93a864672ec441d6c66eb013e887972": [ "v3.1.1" ]
-- name: snapshot-controller
-  dmap:
diff --git a/k8s.gcr.io/images/k8s-staging-csi/generate.sh b/k8s.gcr.io/images/k8s-staging-sig-storage/generate.sh
similarity index 64%
rename from k8s.gcr.io/images/k8s-staging-csi/generate.sh
rename to k8s.gcr.io/images/k8s-staging-sig-storage/generate.sh
index 2338cdc1c783..a624117d6d9c 100755
--- a/k8s.gcr.io/images/k8s-staging-csi/generate.sh
+++ b/k8s.gcr.io/images/k8s-staging-sig-storage/generate.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# List of repos under https://console.cloud.google.com/gcr/images/k8s-staging-csi/GLOBAL
+# List of repos under https://console.cloud.google.com/gcr/images/k8s-staging-sig-storage/GLOBAL
 repos="
 csi-attacher
 csi-node-driver-registrar
@@ -16,6 +16,6 @@ snapshot-controller
 for repo in $repos; do
     echo "- name: $repo"
     echo "  dmap:"
-    gcloud container images list-tags gcr.io/k8s-staging-csi/$repo --format='get(digest, tags)' --filter='tags~^v AND NOT tags~v2020 AND NOT tags~-rc' |
+    gcloud container images list-tags gcr.io/k8s-staging-sig-storage/$repo --format='get(digest, tags)' --filter='tags~^v AND NOT tags~v2020 AND NOT tags~-rc' |
         sed -e 's/\([^ ]*\)\t\(.*\)/    "\1": [ "\2" ]/'
 done
diff --git a/k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml b/k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml
index d48c82d0a75b..b2a04744f03c 100644
--- a/k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml
+++ b/k8s.gcr.io/images/k8s-staging-sig-storage/images.yaml
@@ -1 +1,32 @@
-# No images yet
+- name: csi-attacher
+  dmap:
+    "sha256:2ffa647e8107cfd39e5f464e738dce014c9f5e51b108da36c3ab621048d0bbab": [ "v2.2.0" ]
+- name: csi-node-driver-registrar
+  dmap:
+    "sha256:9622c6a6dac7499a055a382930f4de82905a3c5735c0753f7094115c9c871309": [ "v1.3.0" ]
+    "sha256:273175c272162d480d06849e09e6e3cdb0245239e3a82df6630df3bc059c6571": [ "v1.2.0" ]
+- name: csi-provisioner
+  dmap:
+    "sha256:78e3393f5fd5ff6c1e5dada2478cfa456fb7164929e573cf9a87bf6532730679": [ "v1.6.0" ]
+    "sha256:6fe39f4682c8677af7761948b196f27c45de566fb5f1612bb8114cd68bfe535e": [ "v1.5.0" ]
+    "sha256:438c04395d03fa671f8656d6f951332516754e330d1ac4f9588df1ba2870a366": [ "v1.4.0" ]
+- name: csi-resizer
+  dmap:
+    "sha256:6c6a0332693a7c456378f6abd2bb40611826c1e1a733cadbdae2daab3125b71c": [ "v0.5.0" ]
+    "sha256:43195976fb9f94d943f5dd9d58b8afa543be22d09a1165e8a489b7dfe22c657a": [ "v0.4.0" ]
+- name: csi-snapshotter
+  dmap:
+    "sha256:35ead85dd09aa8cc612fdb598d4e0e2f048bef816f1b74df5eeab67cd21b10aa": [ "v2.1.0" ]
+    "sha256:1530db9fd380ecee86b48a7b3540568c46adb5a64b7fe718c51d9260c4834fd8": [ "v2.0.1" ]
+    "sha256:4e78bb0116555a10ef59c1cdf0648b06b483903a1919def5e3c7ba68b9fa08cb": [ "v1.2.0" ]
+- name: hostpathplugin
+  dmap:
+- name: livenessprobe
+  dmap:
+    "sha256:f8cec70adc74897ddde5da4f1da0209a497370eaf657566e2b36bc5f0f3ccbd7": [ "v1.1.0" ]
+- name: mock-driver
+  dmap:
+    "sha256:5290491dc39ef261b3ef17de2a78cfa1186148b4af10d5b99328258111d3a340": [ "v3.1.1" ]
+    "sha256:0b4273abac4c241fa3d70aaf52b0d79a133d2737081f4a5c5dea4949f6c45dc3": [ "v3.1.0" ]
+- name: snapshot-controller
+  dmap:
diff --git a/k8s.gcr.io/manifests/k8s-staging-csi/promoter-manifest.yaml b/k8s.gcr.io/manifests/k8s-staging-csi/promoter-manifest.yaml
deleted file mode 100644
index ff517351227d..000000000000
--- a/k8s.gcr.io/manifests/k8s-staging-csi/promoter-manifest.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# google group for gcr.io/k8s-staging-csi is k8s-infra-staging-csi@kubernetes.io
-registries:
-- name: gcr.io/k8s-staging-csi
-  src: true
-- name: us.gcr.io/k8s-artifacts-prod/csi
-  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
-- name: eu.gcr.io/k8s-artifacts-prod/csi
-  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com
-- name: asia.gcr.io/k8s-artifacts-prod/csi
-  service-account: k8s-infra-gcr-promoter@k8s-artifacts-prod.iam.gserviceaccount.com