diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
index 52555866..a531f433 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/drydock/drydock.yaml
@@ -62,6 +62,23 @@ metadata:
       dest:
         path: .values.endpoints.physicalprovisioner.port.api.nodeport
 
+    # MaaS IPs
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        # TODO(mb874d): Can change once we have an accessible VIP from fresh nodes.
+        path: .genesis.ip
+      dest:
+        path: .values.conf.drydock.maasdriver.maas_api_url
+        pattern: 'MAAS_IP'
+    - src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .node_ports.maas_api
+      dest:
+        path: .values.conf.drydock.maasdriver.maas_api_url
+        pattern: 'MAAS_PORT'
+
     # Credentials
 
     - src:
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 8c127f78..2886f21a 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -22,7 +22,7 @@ data:
           type: git
           location: https://git.openstack.org/openstack/openstack-helm-infra
           subpath: helm-toolkit
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         calico:
           type: git
           location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -42,7 +42,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       controller-manager:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -52,7 +52,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       coredns:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -62,7 +62,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       haproxy:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -72,7 +72,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       etcd:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -82,17 +82,17 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: ingress
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       proxy:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -102,7 +102,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       scheduler:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -112,18 +112,18 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
     ucp:
       nfs_provisioner:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: nfs-provisioner
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       nfs_htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       armada:
         type: git
         location: https://git.openstack.org/openstack/airship-armada
@@ -133,7 +133,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       barbican:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -143,7 +143,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       #TODO Update to split ceph charts
       ceph:
         type: git
@@ -164,7 +164,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       divingbell:
         type: git
         location: https://git.openstack.org/openstack/airship-divingbell
@@ -174,7 +174,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       drydock:
         type: git
         location: https://git.openstack.org/openstack/airship-drydock
@@ -189,12 +189,12 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: ingress
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       postgresql:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -204,7 +204,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       promenade:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -214,7 +214,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       keystone:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -224,17 +224,17 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       maas:
         type: git
         location: https://git.openstack.org/openstack/airship-maas
         subpath: charts/maas
-        reference: master
+        reference: 2e003450cceb16b9bda71aa69a939a8466516582
       maas-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       mariadb:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -244,27 +244,27 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       memcached:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: memcached
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       memcached-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       rabbitmq:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: rabbitmq
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       rabbitmq-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       shipyard:
         type: git
         location: https://git.openstack.org/openstack/airship-shipyard
@@ -284,7 +284,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
     openstack:
       glance:
         type: git
@@ -295,7 +295,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       heat:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -305,7 +305,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       horizon:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -315,17 +315,17 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: ingress
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       keystone:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -335,7 +335,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       libvirt:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -345,7 +345,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       mariadb:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -355,17 +355,17 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       memcached:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: memcached
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       memcached-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       neutron:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -375,7 +375,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       nova:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -385,7 +385,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       openvswitch:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -395,17 +395,17 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       rabbitmq:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: rabbitmq
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       rabbitmq-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
 
   files:
     kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index 9364afea..f021712a 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -22,7 +22,7 @@ data:
           type: git
           location: https://git.openstack.org/openstack/openstack-helm-infra
           subpath: helm-toolkit
-          reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         calico:
           type: git
           location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -42,7 +42,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       controller-manager:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -52,7 +52,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       coredns:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -62,7 +62,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       haproxy:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -72,7 +72,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       etcd:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -82,17 +82,17 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: ingress
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       proxy:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -102,7 +102,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       scheduler:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -112,18 +112,18 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
     ucp:
       nfs_provisioner:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: nfs-provisioner
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       nfs_htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       armada:
         type: git
         location: https://git.openstack.org/openstack/airship-armada
@@ -133,7 +133,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       barbican:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -143,7 +143,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       #TODO Update to split ceph charts
       ceph:
         type: git
@@ -165,7 +165,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       divingbell:
         type: git
         location: https://git.openstack.org/openstack/airship-divingbell
@@ -175,29 +175,27 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       drydock:
         type: git
         location: https://git.openstack.org/openstack/airship-drydock
         subpath: charts/drydock
-        reference: f8c821e7219f84f12e3a90e3101c6f20d3049b5b
-      # TODO waiting for https://review.openstack.org/#/c/595902/ to move to
-      #      openstack-helm-infra version.
+        reference: master
       drydock-htk:
         type: git
-        location: https://git.openstack.org/openstack/openstack-helm
+        location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
+        reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
       ingress:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: ingress
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       ingress-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       postgresql:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -207,7 +205,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       promenade:
         type: git
         location: https://git.openstack.org/openstack/airship-promenade
@@ -217,7 +215,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       keystone:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -227,19 +225,17 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       maas:
         type: git
         location: https://git.openstack.org/openstack/airship-maas
         subpath: charts/maas
-        # TODO(bryan-strassner) set to new version
-        #     when https://review.openstack.org/#/c/595398/ is complete
-        reference: refs/changes/98/595398/5
+        reference: 2e003450cceb16b9bda71aa69a939a8466516582
       maas-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       mariadb:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -249,27 +245,27 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       memcached:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: memcached
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       memcached-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       rabbitmq:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: rabbitmq
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       rabbitmq-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       shipyard:
         type: git
         location: https://git.openstack.org/openstack/airship-shipyard
@@ -289,7 +285,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: b6fc24b9960bc6de29aa70c7d5b7725319046160
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
 
   files:
     kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz