diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 557c2d78f..faba7ec51 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -4,23 +4,23 @@ data:
     kubernetes:
       apiserver:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
+        reference: b5a05dc762f1b8ca05de90febbef519ea336495b
         subpath: charts/apiserver
         type: git
       apiserver-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       calico:
         calico:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+          reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
           subpath: calico
           type: git
         calico-htk:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+          reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
           subpath: helm-toolkit
           type: git
         etcd:
@@ -30,7 +30,7 @@ data:
           type: git
         etcd-htk:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+          reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
           subpath: helm-toolkit
           type: git
       controller-manager:
@@ -40,7 +40,7 @@ data:
         type: git
       controller-manager-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       coredns:
@@ -50,7 +50,7 @@ data:
         type: git
       coredns-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       etcd:
@@ -60,7 +60,7 @@ data:
         type: git
       etcd-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       haproxy:
@@ -70,17 +70,17 @@ data:
         type: git
       haproxy-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       proxy:
@@ -90,7 +90,7 @@ data:
         type: git
       proxy-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       scheduler:
@@ -100,144 +100,144 @@ data:
         type: git
       scheduler-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
     osh:
       barbican:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: barbican
         type: git
       cinder:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: cinder
         type: git
       glance:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: glance
         type: git
       heat:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: heat
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       horizon:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: horizon
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ingress
         type: git
       keystone:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: keystone
         type: git
       libvirt:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: libvirt
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: mariadb
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: memcached
         type: git
       neutron:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: neutron
         type: git
       nova:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: nova
         type: git
       openvswitch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: openvswitch
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: rabbitmq
         type: git
     osh_infra:
       elasticsearch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: elasticsearch
         type: git
       fluent_logging:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: fluent-logging
         type: git
       grafana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: grafana
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       kibana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: kibana
         type: git
       nagios:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: nagios
         type: git
       prometheus:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: prometheus
         type: git
       prometheus_alertmanager:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: prometheus-alertmanager
         type: git
       prometheus_kube_state_metrics:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: prometheus-kube-state-metrics
         type: git
       prometheus_node_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: prometheus-node-exporter
         type: git
       prometheus_openstack_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: prometheus-openstack-exporter
         type: git
       prometheus_process_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: prometheus-process-exporter
         type: git
     ucp:
@@ -248,47 +248,47 @@ data:
         type: git
       armada-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       barbican:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: barbican
         type: git
       barbican-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-rgw
         type: git
       deckhand:
@@ -298,7 +298,7 @@ data:
         type: git
       deckhand-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       divingbell:
@@ -308,7 +308,7 @@ data:
         type: git
       divingbell-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       drydock:
@@ -318,27 +318,27 @@ data:
         type: git
       drydock-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       keystone:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 1d5dfa2468a9ad28cd19f37198370b56a0c47a26
+        reference: f915a85f2ba8ad2f59044c5b8ad733d013a12e25
         subpath: keystone
         type: git
       keystone-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       maas:
@@ -348,57 +348,57 @@ data:
         type: git
       maas-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: memcached
         type: git
       memcached-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       postgresql:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: postgresql
         type: git
       postgresql-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       promenade:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
+        reference: b5a05dc762f1b8ca05de90febbef519ea336495b
         subpath: charts/promenade
         type: git
       promenade-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       shipyard:
@@ -408,37 +408,37 @@ data:
         type: git
       shipyard-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       tenant-ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: ceph-rgw
         type: git
       tiller:
@@ -448,7 +448,7 @@ data:
         type: git
       tiller-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: ff51fd77e1a9231ca2e463c6e763cc14f3336bcc
+        reference: 13124286e2147d7c23711eda7239d0f88e0cc1e4
         subpath: helm-toolkit
         type: git
   files:
@@ -545,7 +545,7 @@ data:
       memcached: {}
       postgresql: {}
       promenade:
-        promenade: quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22
+        promenade: quay.io/airshipit/promenade:b5a05dc762f1b8ca05de90febbef519ea336495b
       rabbitmq: {}
       shipyard:
         airflow: quay.io/airshipit/airflow:e232975db806c4d1fab43cda6dfa08e22cebb180