diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 66f712c40..c0d1f2c8a 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -9,18 +9,18 @@ data:
         type: git
       apiserver-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       calico:
         calico:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+          reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
           subpath: calico
           type: git
         calico-htk:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+          reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
           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: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+          reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
           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: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         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: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         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: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         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: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         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: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       scheduler:
@@ -100,7 +100,7 @@ data:
         type: git
       scheduler-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
     osh:
@@ -126,7 +126,7 @@ data:
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       horizon:
@@ -136,7 +136,7 @@ data:
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ingress
         type: git
       keystone:
@@ -146,17 +146,17 @@ data:
         type: git
       libvirt:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: libvirt
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: mariadb
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: memcached
         type: git
       neutron:
@@ -171,78 +171,78 @@ data:
         type: git
       openvswitch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: openvswitch
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: rabbitmq
         type: git
     osh_infra:
       elasticsearch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: elasticsearch
         type: git
       fluent_logging:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: fluent-logging
         type: git
       grafana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: grafana
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       kibana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: kibana
         type: git
       nagios:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: nagios
         type: git
       podsecuritypolicy:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: podsecuritypolicy
         type: git
       prometheus:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: prometheus
         type: git
       prometheus_alertmanager:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: prometheus-alertmanager
         type: git
       prometheus_kube_state_metrics:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: prometheus-kube-state-metrics
         type: git
       prometheus_node_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: prometheus-node-exporter
         type: git
       prometheus_openstack_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: prometheus-openstack-exporter
         type: git
       prometheus_process_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: prometheus-process-exporter
         type: git
     ucp:
@@ -253,7 +253,7 @@ data:
         type: git
       armada-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       barbican:
@@ -263,37 +263,37 @@ data:
         type: git
       barbican-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-rgw
         type: git
       deckhand:
@@ -303,7 +303,7 @@ data:
         type: git
       deckhand-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       divingbell:
@@ -313,7 +313,7 @@ data:
         type: git
       divingbell-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       drydock:
@@ -323,17 +323,17 @@ data:
         type: git
       drydock-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       keystone:
@@ -343,7 +343,7 @@ data:
         type: git
       keystone-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       maas:
@@ -353,37 +353,37 @@ data:
         type: git
       maas-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: memcached
         type: git
       memcached-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       postgresql:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: postgresql
         type: git
       postgresql-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       promenade:
@@ -393,17 +393,17 @@ data:
         type: git
       promenade-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       shipyard:
@@ -413,37 +413,37 @@ data:
         type: git
       shipyard-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       tenant-ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: ceph-rgw
         type: git
       tiller:
@@ -453,7 +453,7 @@ data:
         type: git
       tiller-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: d1b77b2bea3b67471f834872b36875dcaea6bb6f
+        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
         subpath: helm-toolkit
         type: git
   files: