diff --git a/daemonjob-controller/Chart.yaml b/daemonjob-controller/Chart.yaml
index fe9514395..74a897895 100644
--- a/daemonjob-controller/Chart.yaml
+++ b/daemonjob-controller/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: A Helm chart for DaemonjobController
 name: daemonjob-controller
-version: 0.1.2
+version: 0.1.3
 home: https://opendev.org/openstack
 ...
diff --git a/daemonjob-controller/values.yaml b/daemonjob-controller/values.yaml
index d07a3b961..d9f0e400e 100644
--- a/daemonjob-controller/values.yaml
+++ b/daemonjob-controller/values.yaml
@@ -20,7 +20,7 @@ release_group: null
 images:
   tags:
     python: docker.io/python:3.7-slim
-    pause: gcr.io/google_containers/pause:latest
+    pause: k8s.gcr.io/pause:latest
     image_repo_sync: docker.io/docker:17.07.0
   pullPolicy: IfNotPresent
   local_registry:
diff --git a/etcd/Chart.yaml b/etcd/Chart.yaml
index 62ed9ef40..7ba30b2d6 100644
--- a/etcd/Chart.yaml
+++ b/etcd/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v3.4.3
 description: OpenStack-Helm etcd
 name: etcd
-version: 0.1.1
+version: 0.1.2
 home: https://coreos.com/etcd/
 icon: https://raw.githubusercontent.com/CloudCoreo/etcd-cluster/master/images/icon.png
 sources:
diff --git a/etcd/values.yaml b/etcd/values.yaml
index c891a2ea2..b83fd7bed 100644
--- a/etcd/values.yaml
+++ b/etcd/values.yaml
@@ -18,7 +18,7 @@
 ---
 images:
   tags:
-    etcd: 'gcr.io/google_containers/etcd-amd64:3.4.3'
+    etcd: 'k8s.gcr.io/etcd-amd64:3.4.3'
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
diff --git a/falco/Chart.yaml b/falco/Chart.yaml
index 697c2a9f1..d8bf526a5 100644
--- a/falco/Chart.yaml
+++ b/falco/Chart.yaml
@@ -13,7 +13,7 @@
 ---
 apiVersion: v1
 name: falco
-version: 0.1.1
+version: 0.1.2
 appVersion: 0.11.1
 description: Sysdig Falco
 keywords:
diff --git a/falco/values.yaml b/falco/values.yaml
index 4c8d7ef09..07c168d2f 100644
--- a/falco/values.yaml
+++ b/falco/values.yaml
@@ -1062,9 +1062,9 @@ conf:
                      not container.image startswith sysdig/falco-event-generator) or
                     container.image startswith quay.io/sysdig or
                     container.image startswith sysdig/sysdig or
-                    container.image startswith gcr.io/google_containers/hyperkube or
+                    container.image startswith k8s.gcr.io/hyperkube or
                     container.image startswith quay.io/coreos/flannel or
-                    container.image startswith gcr.io/google_containers/kube-proxy or
+                    container.image startswith k8s.gcr.io/kube-proxy or
                     container.image startswith calico/node or
                     container.image startswith rook/toolbox or
                     container.image startswith registry.access.redhat.com/openshift3/logging-fluentd or
@@ -1300,8 +1300,8 @@ conf:
         condition: (fd.sip="1.2.3.4" and fd.sport=8080)
       - macro: k8s_containers
         condition: >
-          (container.image startswith gcr.io/google_containers/hyperkube-amd64 or
-           container.image startswith gcr.io/google_containers/kube2sky or
+          (container.image startswith k8s.gcr.io/hyperkube-amd64 or
+           container.image startswith k8s.gcr.io/kube2sky or
            container.image startswith sysdig/agent or
            container.image startswith sysdig/falco or
            container.image startswith sysdig/sysdig)
diff --git a/ingress/Chart.yaml b/ingress/Chart.yaml
index 10de26a1e..040456fc6 100644
--- a/ingress/Chart.yaml
+++ b/ingress/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v0.32.0
 description: OpenStack-Helm Ingress Controller
 name: ingress
-version: 0.1.1
+version: 0.1.2
 home: https://github.com/kubernetes/ingress
 sources:
   - https://github.com/kubernetes/ingress
diff --git a/ingress/values.yaml b/ingress/values.yaml
index a1fc9e07a..40d2ba6c2 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -28,7 +28,7 @@ images:
     ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0
     ingress_module_init: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
     ingress_routed_vip: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
-    error_pages: gcr.io/google_containers/defaultbackend:1.4
+    error_pages: k8s.gcr.io/defaultbackend:1.4
     keepalived: docker.io/osixia/keepalived:1.4.5
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
diff --git a/kube-dns/Chart.yaml b/kube-dns/Chart.yaml
index f4d993435..60e572766 100644
--- a/kube-dns/Chart.yaml
+++ b/kube-dns/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.14.5
 description: OpenStack-Helm Kube-DNS
 name: kube-dns
-version: 0.1.1
+version: 0.1.2
 home: https://github.com/coreos/flannel
 icon: https://raw.githubusercontent.com/coreos/flannel/master/logos/flannel-horizontal-color.png
 sources:
diff --git a/kube-dns/values.yaml b/kube-dns/values.yaml
index 321745d2b..f816b6e29 100644
--- a/kube-dns/values.yaml
+++ b/kube-dns/values.yaml
@@ -20,9 +20,9 @@ labels:
 
 images:
   tags:
-    kube_dns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
-    kube_dns_nanny: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5
-    kube_dns_sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
+    kube_dns: k8s.gcr.io/k8s-dns-kube-dns-amd64:1.14.5
+    kube_dns_nanny: k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:1.14.5
+    kube_dns_sidecar: k8s.gcr.io/k8s-dns-sidecar-amd64:1.14.5
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index c200a8bc1..cf9f6da76 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.1.4
+version: 0.1.5
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 147c7c9ca..9a46357e9 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -22,7 +22,7 @@ images:
   tags:
     mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_xenial
     ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
-    error_pages: gcr.io/google_containers/defaultbackend:1.4
+    error_pages: k8s.gcr.io/defaultbackend:1.4
     prometheus_create_mysql_user: docker.io/mariadb:10.2.31
     prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.11.0
     prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton-ubuntu_xenial
diff --git a/registry/Chart.yaml b/registry/Chart.yaml
index 8de256b07..fe24250d4 100644
--- a/registry/Chart.yaml
+++ b/registry/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v2.0.0
 description: OpenStack-Helm Docker Registry
 name: registry
-version: 0.1.1
+version: 0.1.2
 home: https://github.com/kubernetes/ingress
 sources:
   - https://opendev.org/openstack/openstack-helm
diff --git a/registry/values.yaml b/registry/values.yaml
index af0a64cc1..11ccb78fd 100644
--- a/registry/values.yaml
+++ b/registry/values.yaml
@@ -29,7 +29,7 @@ release_group: null
 images:
   tags:
     registry: docker.io/registry:2
-    registry_proxy: gcr.io/google_containers/kube-registry-proxy:0.4
+    registry_proxy: k8s.gcr.io/kube-registry-proxy:0.4
     bootstrap: docker.io/docker:17.07.0
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
   pull_policy: "IfNotPresent"
diff --git a/tools/image-repo-overides.sh b/tools/image-repo-overides.sh
index fa7a216a1..b2af5b2b4 100755
--- a/tools/image-repo-overides.sh
+++ b/tools/image-repo-overides.sh
@@ -13,12 +13,12 @@
 # limitations under the License.
 
 KUBE_VERSION=$(yq -r '.version.kubernetes' ./tools/gate/playbooks/vars.yaml)
-KUBE_IMAGES="gcr.io/google_containers/kube-apiserver-amd64:${KUBE_VERSION}
-gcr.io/google_containers/kube-controller-manager-amd64:${KUBE_VERSION}
-gcr.io/google_containers/kube-proxy-amd64:${KUBE_VERSION}
-gcr.io/google_containers/kube-scheduler-amd64:${KUBE_VERSION}
-gcr.io/google_containers/pause-amd64:3.0
-gcr.io/google_containers/etcd-amd64:3.4.3"
+KUBE_IMAGES="k8s.gcr.io/kube-apiserver-amd64:${KUBE_VERSION}
+k8s.gcr.io/kube-controller-manager-amd64:${KUBE_VERSION}
+k8s.gcr.io/kube-proxy-amd64:${KUBE_VERSION}
+k8s.gcr.io/kube-scheduler-amd64:${KUBE_VERSION}
+k8s.gcr.io/pause-amd64:3.0
+k8s.gcr.io/etcd-amd64:3.4.3"
 
 CHART_IMAGES=""
 for CHART_DIR in ./*/ ; do
diff --git a/tools/images/kubeadm-aio/assets/entrypoint.sh b/tools/images/kubeadm-aio/assets/entrypoint.sh
index 47f916fbb..8bf7918d4 100755
--- a/tools/images/kubeadm-aio/assets/entrypoint.sh
+++ b/tools/images/kubeadm-aio/assets/entrypoint.sh
@@ -38,7 +38,7 @@ fi
 : ${PVC_SUPPORT_NFS:="false"}
 : ${HELM_TILLER_IMAGE:="gcr.io/kubernetes-helm/tiller:${HELM_VERSION}"}
 : ${KUBE_VERSION:="${KUBE_VERSION}"}
-: ${KUBE_IMAGE_REPO:="gcr.io/google_containers"}
+: ${KUBE_IMAGE_REPO:="k8s.gcr.io"}
 : ${KUBE_API_BIND_PORT:="6443"}
 : ${KUBE_NET_DNS_DOMAIN:="cluster.local"}
 : ${KUBE_NET_POD_SUBNET:="192.168.0.0/16"}
diff --git a/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml b/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
index 0e7aa0311..fa005c337 100644
--- a/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
+++ b/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml
@@ -37,7 +37,7 @@ all:
       tiller_image: gcr.io/kubernetes-helm/tiller:v2.7.0
     k8s:
       kubernetesVersion: v1.18.9
-      imageRepository: gcr.io/google_containers
+      imageRepository: k8s.gcr.io
       certificatesDir: /etc/kubernetes/pki
       selfHosted: false
       keystoneAuth: false