diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index c0d1f2c8a..626a2b44a 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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       calico:
         calico:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+          reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
           subpath: calico
           type: git
         calico-htk:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+          reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
           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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+          reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
           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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       scheduler:
@@ -100,149 +100,149 @@ data:
         type: git
       scheduler-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
     osh:
       barbican:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: barbican
         type: git
       cinder:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: cinder
         type: git
       glance:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: glance
         type: git
       heat:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: heat
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       horizon:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: horizon
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ingress
         type: git
       keystone:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: keystone
         type: git
       libvirt:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: libvirt
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: mariadb
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: memcached
         type: git
       neutron:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: neutron
         type: git
       nova:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: nova
         type: git
       openvswitch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: openvswitch
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: rabbitmq
         type: git
     osh_infra:
       elasticsearch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: elasticsearch
         type: git
       fluent_logging:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: fluent-logging
         type: git
       grafana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: grafana
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       kibana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: kibana
         type: git
       nagios:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: nagios
         type: git
       podsecuritypolicy:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: podsecuritypolicy
         type: git
       prometheus:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: prometheus
         type: git
       prometheus_alertmanager:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: prometheus-alertmanager
         type: git
       prometheus_kube_state_metrics:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: prometheus-kube-state-metrics
         type: git
       prometheus_node_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: prometheus-node-exporter
         type: git
       prometheus_openstack_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: prometheus-openstack-exporter
         type: git
       prometheus_process_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: prometheus-process-exporter
         type: git
     ucp:
@@ -253,47 +253,47 @@ data:
         type: git
       armada-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       barbican:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: barbican
         type: git
       barbican-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       drydock:
@@ -323,27 +323,27 @@ data:
         type: git
       drydock-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       keystone:
         location: https://git.openstack.org/openstack/openstack-helm
-        reference: 658138935feef6380a2c13644ef9f425b5a921bb
+        reference: c863bb0cec3a6812ee5664153d6063836121d683
         subpath: keystone
         type: git
       keystone-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         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: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: memcached
         type: git
       memcached-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       postgresql:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: postgresql
         type: git
       postgresql-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       promenade:
@@ -393,67 +393,67 @@ data:
         type: git
       promenade-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       shipyard:
         location: https://git.openstack.org/openstack/airship-shipyard
-        reference: 1474d7856f93a1482e2a1f31fbfdff408bfd6b1c
+        reference: 6bd02eea8477bba077848463e7e740efe12fa782
         subpath: charts/shipyard
         type: git
       shipyard-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       tenant-ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: ceph-rgw
         type: git
       tiller:
         location: https://git.openstack.org/openstack/airship-armada
-        reference: ab3d68d2708fadeca89830777f6eb052226e8367
+        reference: 091dbd283dbd6e7d547af5f2a81a555c39d89167
         subpath: charts/tiller
         type: git
       tiller-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: 404930ae75f9ce0ed822255c25f115c5a7a51b8c
+        reference: 33178a529dadae99d65e1012d283d3c0b9302ed0
         subpath: helm-toolkit
         type: git
   files:
@@ -553,10 +553,10 @@ data:
         promenade: quay.io/airshipit/promenade:76c942b5ce9c106f69173ab8e03319238087262a
       rabbitmq: {}
       shipyard:
-        airflow: quay.io/airshipit/airflow:1474d7856f93a1482e2a1f31fbfdff408bfd6b1c
-        airflow_db_sync: quay.io/airshipit/airflow:1474d7856f93a1482e2a1f31fbfdff408bfd6b1c
-        shipyard: quay.io/airshipit/shipyard:1474d7856f93a1482e2a1f31fbfdff408bfd6b1c
-        shipyard_db_sync: quay.io/airshipit/shipyard:1474d7856f93a1482e2a1f31fbfdff408bfd6b1c
+        airflow: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
+        airflow_db_sync: quay.io/airshipit/airflow:6bd02eea8477bba077848463e7e740efe12fa782
+        shipyard: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
+        shipyard_db_sync: quay.io/airshipit/shipyard:6bd02eea8477bba077848463e7e740efe12fa782
       tiller: {}
   packages:
     gpgkey: |-