diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 6294f1256..4439595f8 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -4,103 +4,103 @@ data:
     kubernetes:
       apiserver:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/apiserver
         type: git
       apiserver-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       calico:
         calico:
           location: https://opendev.org/openstack/openstack-helm-infra
-          reference: b310caef4f27a28d50efb139875eda43324bcf19
+          reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
           subpath: calico
           type: git
         calico-htk:
           location: https://opendev.org/openstack/openstack-helm-infra
-          reference: b310caef4f27a28d50efb139875eda43324bcf19
+          reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
           subpath: helm-toolkit
           type: git
         etcd:
           location: https://opendev.org/airship/promenade
-          reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+          reference: cffca055fe78f53dfae029ee37d981507cb089fe
           subpath: charts/etcd
           type: git
         etcd-htk:
           location: https://opendev.org/openstack/openstack-helm-infra
-          reference: b310caef4f27a28d50efb139875eda43324bcf19
+          reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
           subpath: helm-toolkit
           type: git
       controller-manager:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/controller_manager
         type: git
       controller-manager-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       coredns:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/coredns
         type: git
       coredns-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       etcd:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/etcd
         type: git
       etcd-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       haproxy:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/haproxy
         type: git
       haproxy-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ingress
         type: git
       ingress-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       proxy:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/proxy
         type: git
       proxy-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       scheduler:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/scheduler
         type: git
       scheduler-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
     osh:
@@ -116,7 +116,7 @@ data:
         type: git
       cinder-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       glance:
@@ -126,7 +126,7 @@ data:
         type: git
       glance-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       heat:
@@ -136,12 +136,12 @@ data:
         type: git
       heat-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       helm_toolkit:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       horizon:
@@ -151,17 +151,17 @@ data:
         type: git
       horizon-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ingress
         type: git
       ingress-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       keystone:
@@ -171,37 +171,37 @@ data:
         type: git
       keystone-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       libvirt:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: libvirt
         type: git
       libvirt-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: memcached
         type: git
       memcached-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       neutron:
@@ -211,7 +211,7 @@ data:
         type: git
       neutron-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       nova:
@@ -221,27 +221,27 @@ data:
         type: git
       nova-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       openvswitch:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: openvswitch
         type: git
       openvswitch-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       tempest:
@@ -251,83 +251,83 @@ data:
         type: git
       tempest-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
     osh_infra:
       elasticsearch:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: elasticsearch
         type: git
       fluentbit:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: fluentbit
         type: git
       fluentd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: fluentd
         type: git
       grafana:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: grafana
         type: git
       helm_toolkit:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       kibana:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: kibana
         type: git
       nagios:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: nagios
         type: git
       nfs_provisioner:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: nfs-provisioner
         type: git
       podsecuritypolicy:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: podsecuritypolicy
         type: git
       prometheus:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: prometheus
         type: git
       prometheus_alertmanager:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: prometheus-alertmanager
         type: git
       prometheus_kube_state_metrics:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: prometheus-kube-state-metrics
         type: git
       prometheus_node_exporter:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: prometheus-node-exporter
         type: git
       prometheus_openstack_exporter:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: prometheus-openstack-exporter
         type: git
       prometheus_process_exporter:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: prometheus-process-exporter
         type: git
     ucp:
@@ -338,7 +338,7 @@ data:
         type: git
       armada-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       barbican:
@@ -348,37 +348,37 @@ data:
         type: git
       barbican-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-rgw
         type: git
       deckhand:
@@ -388,7 +388,7 @@ data:
         type: git
       deckhand-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       divingbell:
@@ -398,7 +398,7 @@ data:
         type: git
       divingbell-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       drydock:
@@ -408,17 +408,17 @@ data:
         type: git
       drydock-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ingress
         type: git
       ingress-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       keystone:
@@ -428,107 +428,107 @@ data:
         type: git
       keystone-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       maas:
         location: https://opendev.org/airship/maas
-        reference: 922db8aee15f978b9e58a9a2a1c0052febc41aa8
+        reference: 3f2b12a38e739087045443a14c658e6d786dd1f6
         subpath: charts/maas
         type: git
       maas-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: memcached
         type: git
       memcached-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       postgresql:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: postgresql
         type: git
       postgresql-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       promenade:
         location: https://opendev.org/airship/promenade
-        reference: 7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        reference: cffca055fe78f53dfae029ee37d981507cb089fe
         subpath: charts/promenade
         type: git
       promenade-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       shipyard:
         location: https://opendev.org/airship/shipyard
-        reference: 1472a22dce698ea77f15b007906b263eef470f52
+        reference: 9c5f68cf97585a86c9edfc3b24545b36bdd90e14
         subpath: charts/shipyard
         type: git
       shipyard-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       tenant-ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: ceph-rgw
         type: git
       tiller:
@@ -538,7 +538,7 @@ data:
         type: git
       tiller-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: b310caef4f27a28d50efb139875eda43324bcf19
+        reference: 9b9309fe31867199a45e38d1ea50b8e814d4b5b6
         subpath: helm-toolkit
         type: git
   images:
@@ -627,12 +627,12 @@ data:
       ingress: {}
       keystone: {}
       maas:
-        bootstrap: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
-        db_sync: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
-        export_api_key: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
-        maas_cache: quay.io/airshipit/sstream-cache:922db8aee15f978b9e58a9a2a1c0052febc41aa8
-        maas_rack: quay.io/airshipit/maas-rack-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
-        maas_region: quay.io/airshipit/maas-region-controller:922db8aee15f978b9e58a9a2a1c0052febc41aa8
+        bootstrap: quay.io/airshipit/maas-region-controller:3f2b12a38e739087045443a14c658e6d786dd1f6
+        db_sync: quay.io/airshipit/maas-region-controller:3f2b12a38e739087045443a14c658e6d786dd1f6
+        export_api_key: quay.io/airshipit/maas-region-controller:3f2b12a38e739087045443a14c658e6d786dd1f6
+        maas_cache: quay.io/airshipit/sstream-cache:3f2b12a38e739087045443a14c658e6d786dd1f6
+        maas_rack: quay.io/airshipit/maas-rack-controller:3f2b12a38e739087045443a14c658e6d786dd1f6
+        maas_region: quay.io/airshipit/maas-region-controller:3f2b12a38e739087045443a14c658e6d786dd1f6
       mariadb: {}
       memcached: {}
       pegleg:
@@ -640,13 +640,13 @@ data:
       postgresql: {}
       promenade:
         monitoring_image: busybox:1.28.3
-        promenade: quay.io/airshipit/promenade:7bd693ecc3b1c2dce3cc665983aaca802562cffa
+        promenade: quay.io/airshipit/promenade:cffca055fe78f53dfae029ee37d981507cb089fe
       rabbitmq: {}
       shipyard:
-        airflow: quay.io/airshipit/airflow:1472a22dce698ea77f15b007906b263eef470f52-ubuntu_xenial
-        airflow_db_sync: quay.io/airshipit/airflow:1472a22dce698ea77f15b007906b263eef470f52-ubuntu_xenial
-        shipyard: quay.io/airshipit/shipyard:1472a22dce698ea77f15b007906b263eef470f52-ubuntu_xenial
-        shipyard_db_sync: quay.io/airshipit/shipyard:1472a22dce698ea77f15b007906b263eef470f52-ubuntu_xenial
+        airflow: quay.io/airshipit/airflow:9c5f68cf97585a86c9edfc3b24545b36bdd90e14-ubuntu_xenial
+        airflow_db_sync: quay.io/airshipit/airflow:9c5f68cf97585a86c9edfc3b24545b36bdd90e14-ubuntu_xenial
+        shipyard: quay.io/airshipit/shipyard:9c5f68cf97585a86c9edfc3b24545b36bdd90e14-ubuntu_xenial
+        shipyard_db_sync: quay.io/airshipit/shipyard:9c5f68cf97585a86c9edfc3b24545b36bdd90e14-ubuntu_xenial
       tiller: {}
   packages:
     gpgkey: |-