diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml
index f388dee6..f321e8ba 100644
--- a/charts/apiserver/values.yaml
+++ b/charts/apiserver/values.yaml
@@ -58,9 +58,9 @@ const:
 images:
   tags:
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-    anchor: cwedgwood/kubectl:v1.21.7-1
+    anchor: bitnami/kubectl:1.21.7
     apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
-    key_rotate: cwedgwood/kubectl:v1.21.7-1
+    key_rotate: bitnami/kubectl:1.21.7
   pull_policy: "IfNotPresent"
   local_registry:
     active: false
diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml
index bcc4b2ff..2cb208e2 100644
--- a/charts/controller_manager/values.yaml
+++ b/charts/controller_manager/values.yaml
@@ -16,7 +16,7 @@ release_group: null
 
 images:
   tags:
-    anchor: cwedgwood/kubectl:v1.21.7-1
+    anchor: bitnami/kubectl:1.21.7
     controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
   pull_policy: "IfNotPresent"
 
diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml
index 287648dd..a64d8d8a 100644
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@@ -64,7 +64,7 @@ conf:
 
 images:
   tags:
-    anchor: cwedgwood/kubectl:v1.21.7-1
+    anchor: bitnami/kubectl:1.21.7
     haproxy: haproxy:1.8.25
     test: python:3.6
   pull_policy: "IfNotPresent"
diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml
index 328530fb..11ab185a 100644
--- a/charts/scheduler/values.yaml
+++ b/charts/scheduler/values.yaml
@@ -85,7 +85,7 @@ secrets:
 
 images:
   tags:
-    anchor: cwedgwood/kubectl:v1.21.7-1
+    anchor: bitnami/kubectl:1.21.7
     scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
   pull_policy: "IfNotPresent"
 
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index 72b29a08..f6736e21 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -626,7 +626,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         haproxy: haproxy:1.8.3
         test: python:3.6
 
@@ -734,7 +734,7 @@ data:
         endpoints: https://127.0.0.1:2378
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
     network:
       kubernetes_service_ip: 10.96.0.1
@@ -800,7 +800,7 @@ data:
   values:
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
     secrets:
       service_account:
@@ -874,7 +874,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
 
   source:
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 075ac3cd..54d070e5 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -643,7 +643,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         haproxy: haproxy:1.8.3
         test: python:3.6
 
@@ -736,7 +736,7 @@ data:
         endpoints: https://127.0.0.1:2378
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
     secrets:
       service_account:
@@ -813,7 +813,7 @@ data:
   values:
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
     secrets:
       service_account:
@@ -886,7 +886,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
 
   source:
diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml
index 4752528e..dc51586e 100644
--- a/examples/containerd/armada-resources.yaml
+++ b/examples/containerd/armada-resources.yaml
@@ -523,7 +523,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         haproxy: haproxy:1.8.3
         test: python:3.6
 
@@ -632,7 +632,7 @@ data:
         endpoints: https://127.0.0.1:2378
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
     network:
       kubernetes_service_ip: 10.96.0.1
@@ -698,7 +698,7 @@ data:
   values:
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
     secrets:
       service_account:
@@ -772,7 +772,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
 
   source:
diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml
index 65bb6fde..eec555e8 100644
--- a/examples/gate/armada-resources.yaml
+++ b/examples/gate/armada-resources.yaml
@@ -529,7 +529,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         haproxy: haproxy:1.8.3
         test: python:3.6
 
@@ -638,7 +638,7 @@ data:
         endpoints: https://127.0.0.1:2378
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
     network:
       kubernetes_service_ip: 10.96.0.1
@@ -704,7 +704,7 @@ data:
   values:
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
     secrets:
       service_account:
@@ -778,7 +778,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
 
   source:
diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml
index 1ac2bd86..fd7df29a 100644
--- a/tests/unit/builder_data/simple/armada-resources.yaml
+++ b/tests/unit/builder_data/simple/armada-resources.yaml
@@ -536,7 +536,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         haproxy: haproxy:1.8.3
         test: python:3.6
 
@@ -635,7 +635,7 @@ data:
         endpoints: https://127.0.0.1:2378
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
     secrets:
       service_account:
@@ -712,7 +712,7 @@ data:
   values:
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
     secrets:
       service_account:
@@ -785,7 +785,7 @@ data:
 
     images:
       tags:
-        anchor: cwedgwood/kubectl:v1.21.7-1
+        anchor: bitnami/kubectl:1.21.7
         scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
 
   source:
diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env
index dcb87a67..43266913 100644
--- a/tools/gate/default-config-env
+++ b/tools/gate/default-config-env
@@ -12,5 +12,5 @@ IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.21.7
 IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
 IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.21.7
 IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.21.7
-IMAGE_ANCHOR=cwedgwood/kubectl:v1.21.7-1
+IMAGE_ANCHOR=bitnami/kubectl:1.21.7
 KUBELET_URL=https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES
index fc2e0316..6c3eeda8 100644
--- a/tools/registry/IMAGES
+++ b/tools/registry/IMAGES
@@ -1,6 +1,6 @@
 # source_name, tag, cache_name
 coredns/coredns,1.7.0,coredns
-cwedgwood/kubectl,v1.21.7-1,kubectl
+bitnami/kubectl,1.21.7,kubectl
 k8s.gcr.io/kube-apiserver-amd64,v1.21.7,apiserver
 k8s.gcr.io/kube-controller-manager-amd64,v1.21.7,controller-manager
 k8s.gcr.io/kube-scheduler-amd64,v1.21.7,scheduler