diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 3e91d695..8e45ce17 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -16,7 +16,7 @@ substitutions:
 steps:
   # TODO: currently gcr.io/k8s-testimages/gcb-docker-gcloud has not moved to Artifact Registry
   # gcr.io will be shut down 18 Mar 2025, and we need replacement before then. Latest info below:
-  # https://github.com/kubernetes/test-infra/blob/master/images/gcb-docker-gcloud/cloudbuild.yaml
+  # https://github.com/kubernetes/k8s.io/issues/1523#issuecomment-920311451
   - id: do-multi-arch-build-all-images
     name: gcr.io/k8s-testimages/gcb-docker-gcloud:v20240718-5ef92b5c36
     args:
diff --git a/controller/Dockerfile b/controller/Dockerfile
index 5b6a216e..e910a087 100644
--- a/controller/Dockerfile
+++ b/controller/Dockerfile
@@ -29,6 +29,9 @@ RUN CGO_ENABLED=0 go build -o /buildroot/artifacts/controller cmd/*.go
 #
 # FINAL IMAGE
 #
+
+# gcr.io is deprecated, but gcr.io/distroless/static is hosted by artifact hub with the gcr.io path.
+# See: https://github.com/GoogleContainerTools/distroless/issues/1320
 FROM gcr.io/distroless/static:nonroot
 
 LABEL maintainers="Kubernetes Authors"
diff --git a/hack/Dockerfile.in b/hack/Dockerfile.in
index 7b8206f2..828ac5ad 100644
--- a/hack/Dockerfile.in
+++ b/hack/Dockerfile.in
@@ -27,6 +27,9 @@ RUN CGO_ENABLED=0 go build -o /buildroot/artifacts/{{COMPONENT}} cmd/*.go
 #
 # FINAL IMAGE
 #
+
+# gcr.io is deprecated, but gcr.io/distroless/static is hosted by artifact hub with the gcr.io path.
+# See: https://github.com/GoogleContainerTools/distroless/issues/1320
 FROM gcr.io/distroless/static:nonroot
 
 LABEL maintainers="Kubernetes Authors"
diff --git a/hack/cloudbuild.sh b/hack/cloudbuild.sh
index 1dffdae8..99748e55 100755
--- a/hack/cloudbuild.sh
+++ b/hack/cloudbuild.sh
@@ -10,7 +10,7 @@ echo "PLATFORM: ${PLATFORM}"
 # debug the rest of the script in case of image/CI build issues
 set -o xtrace
 
-REPO="gcr.io/k8s-staging-sig-storage"
+REPO="registry.k8s.io/k8s-staging-sig-storage"
 
 CONTROLLER_IMAGE="${REPO}/objectstorage-controller"
 SIDECAR_IMAGE="${REPO}/objectstorage-sidecar"
diff --git a/sidecar/Dockerfile b/sidecar/Dockerfile
index cf9c475b..7ce276cb 100644
--- a/sidecar/Dockerfile
+++ b/sidecar/Dockerfile
@@ -29,6 +29,9 @@ RUN CGO_ENABLED=0 go build -o /buildroot/artifacts/sidecar cmd/*.go
 #
 # FINAL IMAGE
 #
+
+# gcr.io is deprecated, but gcr.io/distroless/static is hosted by artifact hub with the gcr.io path.
+# See: https://github.com/GoogleContainerTools/distroless/issues/1320
 FROM gcr.io/distroless/static:nonroot
 
 LABEL maintainers="Kubernetes Authors"