diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
index ff6bb457..e938b703 100644
--- a/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/ucp/core/mariadb.yaml
@@ -72,6 +72,12 @@ data:
       prometheus_mysql_exporter:
         node_selector_key: ucp-control-plane
         node_selector_value: enabled
+      ingress:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
+      error_server:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
     pod:
       replicas:
         server: 1
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 2886f21a..68ee4acd 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -12,107 +12,107 @@ metadata:
 data:
   charts:
     kubernetes:
-      calico:
-        etcd:
-          type: git
-          location: https://git.openstack.org/openstack/airship-promenade
-          subpath: charts/etcd
-          reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
-        etcd-htk:
-          type: git
-          location: https://git.openstack.org/openstack/openstack-helm-infra
-          subpath: helm-toolkit
-          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
-        calico:
-          type: git
-          location: https://git.openstack.org/openstack/openstack-helm-infra
-          subpath: calico
-          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
-        calico-htk:
-          type: git
-          location: https://git.openstack.org/openstack/openstack-helm-infra
-          subpath: helm-toolkit
-          reference: 26e1b9cde63a3d5a55417d25f05cf8787b03256d
       apiserver:
-        type: git
         location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
         subpath: charts/apiserver
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
+        type: git
       apiserver-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
+      calico:
+        calico:
+          location: https://git.openstack.org/openstack/openstack-helm-infra
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+          subpath: calico
+          type: git
+        calico-htk:
+          location: https://git.openstack.org/openstack/openstack-helm-infra
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+          subpath: helm-toolkit
+          type: git
+        etcd:
+          location: https://git.openstack.org/openstack/airship-promenade
+          reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
+          subpath: charts/etcd
+          type: git
+        etcd-htk:
+          location: https://git.openstack.org/openstack/openstack-helm-infra
+          reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+          subpath: helm-toolkit
+          type: git
       controller-manager:
-        type: git
         location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
         subpath: charts/controller_manager
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
+        type: git
       controller-manager-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       coredns:
-        type: git
         location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
         subpath: charts/coredns
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
+        type: git
       coredns-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
-      haproxy:
-        type: git
-        location: https://git.openstack.org/openstack/airship-promenade
-        subpath: charts/haproxy
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
-      haproxy-htk:
-        type: git
-        location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        type: git
       etcd:
-        type: git
         location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
         subpath: charts/etcd
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
+        type: git
       etcd-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
+      haproxy:
+        location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
+        subpath: charts/haproxy
+        type: git
+      haproxy-htk:
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       ingress:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         subpath: ingress
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        type: git
       ingress-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       proxy:
-        type: git
         location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
         subpath: charts/proxy
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
+        type: git
       proxy-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       scheduler:
-        type: git
         location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
         subpath: charts/scheduler
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
-      scheduler-htk:
         type: git
+      scheduler-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
     ucp:
       nfs_provisioner:
         type: git
@@ -125,25 +125,25 @@ data:
         subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       armada:
-        type: git
         location: https://git.openstack.org/openstack/airship-armada
+        reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
         subpath: charts/armada
-        reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
+        type: git
       armada-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       barbican:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm
+        reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70
         subpath: barbican
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
-      barbican-htk:
         type: git
+      barbican-htk:
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       #TODO Update to split ceph charts
       ceph:
         type: git
@@ -156,135 +156,135 @@ data:
         subpath: helm-toolkit
         reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
       deckhand:
-        type: git
         location: https://git.openstack.org/openstack/airship-deckhand
+        reference: 464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
         subpath: charts/deckhand
-        reference: a0f00013b5db1def374fbd5b9f0009f704290bb1
+        type: git
       deckhand-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       divingbell:
-        type: git
         location: https://git.openstack.org/openstack/airship-divingbell
+        reference: a648dcb2db2b842656bfee08102081023080e4d5
         subpath: divingbell
-        reference: 0ac90c40a0741a929204d139dfa0415562b7044e
+        type: git
       divingbell-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       drydock:
-        type: git
         location: https://git.openstack.org/openstack/airship-drydock
+        reference: 756a063c3074ddd847af1dd02c9b576b541cedbd
         subpath: charts/drydock
-        reference: master
+        type: git
       drydock-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         subpath: helm-toolkit
-        reference: bc1afb87d7aa529a4ed5321d889cdfe2f1af8a44
+        type: git
       ingress:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         subpath: ingress
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        type: git
       ingress-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
-      postgresql:
-        type: git
-        location: https://git.openstack.org/openstack/openstack-helm
-        subpath: postgresql
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
-      postgresql-htk:
-        type: git
-        location: https://git.openstack.org/openstack/openstack-helm-infra
         subpath: helm-toolkit
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
-      promenade:
         type: git
-        location: https://git.openstack.org/openstack/airship-promenade
-        subpath: charts/promenade
-        reference: 24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
-      promenade-htk:
-        type: git
-        location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
       keystone:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm
+        reference: 9d72fe1a501bc609a875eebf7b6274e18600ed70
         subpath: keystone
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
+        type: git
       keystone-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       maas:
-        type: git
         location: https://git.openstack.org/openstack/airship-maas
-        subpath: charts/maas
         reference: 2e003450cceb16b9bda71aa69a939a8466516582
+        subpath: charts/maas
+        type: git
       maas-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       mariadb:
-        type: git
-        location: https://git.openstack.org/openstack/openstack-helm
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         subpath: mariadb
-        reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7
+        type: git
       mariadb-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       memcached:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         subpath: memcached
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        type: git
       memcached-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
+      postgresql:
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: postgresql
+        type: git
+      postgresql-htk:
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
+      promenade:
+        location: https://git.openstack.org/openstack/airship-promenade
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
+        subpath: charts/promenade
+        type: git
+      promenade-htk:
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       rabbitmq:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
         subpath: rabbitmq
-        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        type: git
       rabbitmq-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
       shipyard:
-        type: git
         location: https://git.openstack.org/openstack/airship-shipyard
+        reference: 70ec78815dfc9deeb342a3fccfa3cd079a4312d9
         subpath: charts/shipyard
-        reference: 0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
+        type: git
       shipyard-htk:
-        type: git
         location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
-        reference: bb3ff98d53c38a2ba70f506a8b6dc36207baa207
-      tiller:
-        type: git
-        location: https://git.openstack.org/openstack/airship-armada
-        subpath: charts/tiller
-        reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
-      tiller-htk:
-        type: git
-        location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
         reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
+      tiller:
+        location: https://git.openstack.org/openstack/airship-armada
+        reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
+        subpath: charts/tiller
+        type: git
+      tiller-htk:
+        location: https://git.openstack.org/openstack/openstack-helm-infra
+        reference: 6ef48d37060e81cc6ffc283644bcd2df6c7ef80e
+        subpath: helm-toolkit
+        type: git
     openstack:
       glance:
         type: git
@@ -442,29 +442,70 @@ data:
   images:
     ucp:
       armada:
-        api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290
+        api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
         helm: lachlanevenson/k8s-helm:v2.10.0
         tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
+      armada:
+        api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+        helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
+        image_repo_sync: docker.io/docker:17.07.0
+        ks_endpoints: docker.io/openstackhelm/heat:ocata
+        ks_service: docker.io/openstackhelm/heat:ocata
+        ks_user: docker.io/openstackhelm/heat:ocata
+        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
+      deckhand:
+        db_init: docker.io/postgres:9.5
+        db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
+        deckhand: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+        ks_endpoints: docker.io/openstackhelm/heat:ocata
+        ks_service: docker.io/openstackhelm/heat:ocata
+        ks_user: docker.io/openstackhelm/heat:ocata
+      divingbell:
+        divingbell: docker.io/ubuntu:16.04
+      drydock:
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+        drydock: quay.io/airshipit/drydock:04ab7a6a90d2b0aadeabed804df31c9927538f91
+        drydock_db_init: docker.io/postgres:9.5
+        drydock_db_sync: quay.io/airshipit/drydock:04ab7a6a90d2b0aadeabed804df31c9927538f91
+        ks_endpoints: docker.io/openstackhelm/heat:ocata
+        ks_service: docker.io/openstackhelm/heat:ocata
+        ks_user: docker.io/openstackhelm/heat:ocata
+      maas:
+        bootstrap: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
+        db_init: docker.io/postgres:9.5
+        db_sync: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+        export_api_key: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
+        maas_cache: quay.io/airshipit/sstream-cache:2e003450cceb16b9bda71aa69a939a8466516582
+        maas_rack: quay.io/airshipit/maas-rack-controller:2e003450cceb16b9bda71aa69a939a8466516582
+        maas_region: quay.io/airshipit/maas-region-controller:2e003450cceb16b9bda71aa69a939a8466516582
       promenade:
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-        promenade: quay.io/airshipit/promenade:24e4ebf37aac7cc4cf3e8341bc0c0fc48c274fbb
-        ks_user: docker.io/openstackhelm/heat:ocata
-        ks_service: docker.io/openstackhelm/heat:ocata
+        image_repo_sync: docker.io/docker:17.07.0
         ks_endpoints: docker.io/openstackhelm/heat:ocata
-      deckhand:
-        # pinned back to older version to prevent substitution errors with
-        # newer version e.g.: fc03c6318a36fa60faf56ee79d91573fe7c60feb
-        deckhand: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168
+        ks_service: docker.io/openstackhelm/heat:ocata
+        ks_user: docker.io/openstackhelm/heat:ocata
+        promenade: quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22
+      shipyard:
+        airflow: quay.io/airshipit/airflow:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
+        airflow_db_init: docker.io/postgres:9.5
+        airflow_db_sync: quay.io/airshipit/airflow:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-        db_init: docker.io/postgres:9.5
-        db_sync: quay.io/airshipit/deckhand:0ac33c233d59a731bf289db23ec4a882ff359168
+        image_repo_sync: docker.io/docker:17.07.0
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
+        shipyard: quay.io/airshipit/shipyard:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
+        shipyard_db_init: docker.io/postgres:9.5
+        shipyard_db_sync: quay.io/airshipit/shipyard:70ec78815dfc9deeb342a3fccfa3cd079a4312d9
+      tiller:
+        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
       barbican:
         bootstrap: docker.io/openstackhelm/heat:ocata
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
@@ -476,36 +517,6 @@ data:
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
         barbican_api: docker.io/openstackhelm/barbican:ocata
-      drydock:
-        drydock: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
-        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-        ks_user: docker.io/openstackhelm/heat:ocata
-        ks_service: docker.io/openstackhelm/heat:ocata
-        ks_endpoints: docker.io/openstackhelm/heat:ocata
-        drydock_db_init: docker.io/postgres:9.5
-        drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
-      shipyard:
-        airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
-        shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
-        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-        shipyard_db_init: docker.io/postgres:9.5
-        shipyard_db_sync: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
-        airflow_db_init: docker.io/postgres:9.5
-        airflow_db_sync: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
-        ks_user: docker.io/openstackhelm/heat:ocata
-        ks_service: docker.io/openstackhelm/heat:ocata
-        ks_endpoints: docker.io/openstackhelm/heat:ocata
-      maas:
-        db_init: docker.io/postgres:9.5
-        db_sync: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
-        maas_rack: quay.io/airshipit/maas-rack-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
-        maas_region: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
-        bootstrap: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
-        export_api_key: quay.io/airshipit/maas-region-controller:dfb92ce07f87648f3423be11e51425923bc9f8b1
-        maas_cache: quay.io/airshipit/sstream-cache:dfb92ce07f87648f3423be11e51425923bc9f8b1
-        ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
-        error_pages: gcr.io/google_containers/defaultbackend:1.0
-        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
       keystone:
         keystone_bootstrap: docker.io/openstackhelm/heat:ocata
         test: docker.io/kolla/ubuntu-source-rally:4.0.0
@@ -518,10 +529,8 @@ data:
         keystone_credential_rotate: docker.io/openstackhelm/keystone:ocata
         keystone_api: docker.io/openstackhelm/keystone:ocata
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-      tiller:
-        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
       mariadb:
-        mariadb: docker.io/mariadb:10.1.23
+        mariadb: docker.io/openstackhelm/mariadb:10.2.18
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
       postgresql:
         postgresql: docker.io/postgres:9.5
diff --git a/deployment_files/site/gate-multinode/software/configs/versions.yaml b/deployment_files/site/gate-multinode/software/configs/versions.yaml
index ec90d58d..c6ecea2c 100644
--- a/deployment_files/site/gate-multinode/software/configs/versions.yaml
+++ b/deployment_files/site/gate-multinode/software/configs/versions.yaml
@@ -17,18 +17,6 @@ metadata:
 # versions to match a patchset, for example. Anything specified in the global
 # versions can be overridden, such as chart or image versions.
 data:
-  charts:
-    ucp:
-      maas:
-        location: https://git.openstack.org/openstack/airship-maas
-        reference: refs/changes/53/600253/39
-      maas-htk:
-        location: https://git.openstack.org/openstack/openstack-helm-infra
-        subpath: helm-toolkit
-        reference: 4cd00f3ac539f625e7cd9733ae46232b2082027a
-  images:
-    ucp:
-      maas:
-        maas_region: 'docker.io/sthussey/maas-region-controller:dev'
-        maas_cache: 'quay.io/airshipit/sstream-cache:master'
+  charts: {}
+  images: {}
 ...