diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index facd1063b..219fce9d9 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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       calico:
         calico:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: dd6b2a0a1df4672458198643eabb38877da9d905
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
           subpath: calico
           type: git
         calico-htk:
           location: https://git.openstack.org/openstack/openstack-helm-infra
-          reference: dd6b2a0a1df4672458198643eabb38877da9d905
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
           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: dd6b2a0a1df4672458198643eabb38877da9d905
+          reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
           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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       horizon:
@@ -136,7 +136,7 @@ data:
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ingress
         type: git
       keystone:
@@ -146,17 +146,17 @@ data:
         type: git
       libvirt:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: libvirt
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: mariadb
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: memcached
         type: git
       neutron:
@@ -171,12 +171,12 @@ data:
         type: git
       openvswitch:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: openvswitch
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: rabbitmq
         type: git
     osh_infra:
@@ -192,52 +192,52 @@ data:
         type: git
       grafana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: grafana
         type: git
       helm_toolkit:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       kibana:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: kibana
         type: git
       nagios:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: nagios
         type: git
       prometheus:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: prometheus
         type: git
       prometheus_alertmanager:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: prometheus-alertmanager
         type: git
       prometheus_kube_state_metrics:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: prometheus-kube-state-metrics
         type: git
       prometheus_node_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: prometheus-node-exporter
         type: git
       prometheus_openstack_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: prometheus-openstack-exporter
         type: git
       prometheus_process_exporter:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: prometheus-process-exporter
         type: git
     ucp:
@@ -248,7 +248,7 @@ data:
         type: git
       armada-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       barbican:
@@ -258,57 +258,57 @@ data:
         type: git
       barbican-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-client
         type: git
       ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-mon
         type: git
       ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-osd
         type: git
       ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-provisioners
         type: git
       ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-rgw
         type: git
       deckhand:
         location: https://git.openstack.org/openstack/airship-deckhand
-        reference: 2925e519e1d144497b0559cade783081bf2bba0d
+        reference: cc7e00970dd978c392a79537096252e07a3afc1d
         subpath: charts/deckhand
         type: git
       deckhand-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       divingbell:
         location: https://git.openstack.org/openstack/airship-divingbell
-        reference: eebedea5f2fb70c73851f94da4dfd71586236a23
+        reference: 9c2ca300016e5603175004026ca45e9c43c0994f
         subpath: divingbell
         type: git
       divingbell-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: b55e9b10a72ce5531ae22f15f953b2eb71e6f623
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       drydock:
@@ -318,17 +318,17 @@ data:
         type: git
       drydock-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       ingress:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ingress
         type: git
       ingress-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       keystone:
@@ -338,7 +338,7 @@ data:
         type: git
       keystone-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       maas:
@@ -348,37 +348,37 @@ data:
         type: git
       maas-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       mariadb:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: mariadb
         type: git
       mariadb-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       memcached:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: memcached
         type: git
       memcached-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       postgresql:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: postgresql
         type: git
       postgresql-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       promenade:
@@ -388,17 +388,17 @@ data:
         type: git
       promenade-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       rabbitmq:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: rabbitmq
         type: git
       rabbitmq-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       tenant-ceph-client:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-client
         type: git
       tenant-ceph-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
       tenant-ceph-mon:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-mon
         type: git
       tenant-ceph-osd:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-osd
         type: git
       tenant-ceph-provisioners:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: ceph-provisioners
         type: git
       tenant-ceph-rgw:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        reference: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         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: dd6b2a0a1df4672458198643eabb38877da9d905
+        reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
         subpath: helm-toolkit
         type: git
   files:
@@ -547,8 +547,8 @@ data:
       barbican: {}
       deckhand:
         db_init: docker.io/postgres:9.5
-        db_sync: quay.io/airshipit/deckhand:2925e519e1d144497b0559cade783081bf2bba0d
-        deckhand: quay.io/airshipit/deckhand:2925e519e1d144497b0559cade783081bf2bba0d
+        db_sync: quay.io/airshipit/deckhand:cc7e00970dd978c392a79537096252e07a3afc1d
+        deckhand: quay.io/airshipit/deckhand:cc7e00970dd978c392a79537096252e07a3afc1d
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata