diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 85b8a151b..18980daba 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -9,18 +9,18 @@ data:
         type: git
       apiserver-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       calico:
         calico:
           location: https://opendev.org/openstack/openstack-helm-infra
-          reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+          reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
           subpath: calico
           type: git
         calico-htk:
           location: https://opendev.org/openstack/openstack-helm-infra
-          reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+          reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
           subpath: helm-toolkit
           type: git
         etcd:
@@ -30,7 +30,7 @@ data:
           type: git
         etcd-htk:
           location: https://opendev.org/openstack/openstack-helm-infra
-          reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+          reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
           subpath: helm-toolkit
           type: git
       controller-manager:
@@ -40,7 +40,7 @@ data:
         type: git
       controller-manager-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       coredns:
@@ -50,7 +50,7 @@ data:
         type: git
       coredns-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       etcd:
@@ -60,7 +60,7 @@ data:
         type: git
       etcd-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       haproxy:
@@ -70,17 +70,17 @@ data:
         type: git
       haproxy-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ingress
         type: git
       ingress-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       proxy:
@@ -90,7 +90,7 @@ data:
         type: git
       proxy-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       scheduler:
@@ -100,234 +100,234 @@ data:
         type: git
       scheduler-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
     osh:
       barbican:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: barbican
         type: git
       cinder:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: cinder
         type: git
       cinder-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       glance:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: glance
         type: git
       glance-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       heat:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: heat
         type: git
       heat-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       helm_toolkit:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       horizon:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: horizon
         type: git
       horizon-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ingress
         type: git
       ingress-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       keystone:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: keystone
         type: git
       keystone-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       libvirt:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: libvirt
         type: git
       libvirt-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: memcached
         type: git
       memcached-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       neutron:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: neutron
         type: git
       neutron-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       nova:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: nova
         type: git
       nova-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       openvswitch:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: openvswitch
         type: git
       openvswitch-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       tempest:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: tempest
         type: git
       tempest-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
     osh_infra:
       elasticsearch:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: elasticsearch
         type: git
       fluentbit:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: fluentbit
         type: git
       fluentd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: fluentd
         type: git
       grafana:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: grafana
         type: git
       helm_toolkit:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       kibana:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: kibana
         type: git
       nagios:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: nagios
         type: git
       nfs_provisioner:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: nfs-provisioner
         type: git
       podsecuritypolicy:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: podsecuritypolicy
         type: git
       prometheus:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: prometheus
         type: git
       prometheus_alertmanager:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: prometheus-alertmanager
         type: git
       prometheus_kube_state_metrics:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: prometheus-kube-state-metrics
         type: git
       prometheus_node_exporter:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: prometheus-node-exporter
         type: git
       prometheus_openstack_exporter:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: prometheus-openstack-exporter
         type: git
       prometheus_process_exporter:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: prometheus-process-exporter
         type: git
     ucp:
@@ -338,47 +338,47 @@ data:
         type: git
       armada-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       barbican:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: barbican
         type: git
       barbican-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-rgw
         type: git
       deckhand:
@@ -388,7 +388,7 @@ data:
         type: git
       deckhand-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       divingbell:
@@ -398,7 +398,7 @@ data:
         type: git
       divingbell-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       drydock:
@@ -408,27 +408,27 @@ data:
         type: git
       drydock-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ingress
         type: git
       ingress-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       keystone:
         location: https://opendev.org/openstack/openstack-helm
-        reference: 5840bde430b3a66b5497d44cfdb333c24e877115
+        reference: c5c791cd69594061608ac130b16e537d90f3d0de
         subpath: keystone
         type: git
       keystone-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       maas:
@@ -438,37 +438,37 @@ data:
         type: git
       maas-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: memcached
         type: git
       memcached-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       postgresql:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: postgresql
         type: git
       postgresql-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       promenade:
@@ -478,57 +478,57 @@ data:
         type: git
       promenade-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       shipyard:
         location: https://opendev.org/airship/shipyard
-        reference: 9c5f68cf97585a86c9edfc3b24545b36bdd90e14
+        reference: fed3407634c662720885658d179274b74c37f576
         subpath: charts/shipyard
         type: git
       shipyard-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       tenant-ceph-client:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: ceph-rgw
         type: git
       tiller:
@@ -538,7 +538,7 @@ data:
         type: git
       tiller-htk:
         location: https://opendev.org/openstack/openstack-helm-infra
-        reference: 49c8c744acf5671e053a83ac6c6d73b34c941600
+        reference: 2d5684fddcba8aa3a1cdddeeda475448a88ce654
         subpath: helm-toolkit
         type: git
   images:
@@ -643,10 +643,10 @@ data:
         promenade: quay.io/airshipit/promenade:b3533b8522ac67f581837a1a5033d3b9777e9e89
       rabbitmq: {}
       shipyard:
-        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
+        airflow: quay.io/airshipit/airflow:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial
+        airflow_db_sync: quay.io/airshipit/airflow:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial
+        shipyard: quay.io/airshipit/shipyard:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial
+        shipyard_db_sync: quay.io/airshipit/shipyard:fed3407634c662720885658d179274b74c37f576-ubuntu_xenial
       tiller: {}
   packages:
     gpgkey: |-