diff --git a/charts/apiserver/templates/daemonset.yaml b/charts/apiserver/templates/daemonset.yaml
index c370506e..664bbf27 100644
--- a/charts/apiserver/templates/daemonset.yaml
+++ b/charts/apiserver/templates/daemonset.yaml
@@ -16,7 +16,6 @@ limitations under the License.
 
 {{- if .Values.manifests.kubernetes_apiserver }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.kubernetes_apiserver }}
 {{- $mounts_kubernetes_apiserver := .Values.pod.mounts.kubernetes_apiserver.kubernetes_apiserver }}
 {{- $mounts_kubernetes_apiserver_init := .Values.pod.mounts.kubernetes_apiserver.init_container }}
 ---
@@ -46,8 +45,6 @@ spec:
         - key: CriticalAddonsOnly
           operator: Exists
       terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.kubernetes_apiserver.timeout }}
-      initContainers:
-{{ tuple $envAll $dependencies $mounts_kubernetes_apiserver_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: anchor
           image: {{ .Values.images.tags.anchor }}
diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml
index 958c2334..832117c2 100644
--- a/charts/apiserver/values.yaml
+++ b/charts/apiserver/values.yaml
@@ -85,9 +85,6 @@ secrets:
       cert: placeholder
       key: placeholder
 
-dependencies:
-  kubernetes_apiserver:
-
 # typically overriden by environmental
 # values, but should include all endpoints
 # required by this chart
diff --git a/charts/controller_manager/templates/daemonset.yaml b/charts/controller_manager/templates/daemonset.yaml
index f838545d..59c484de 100644
--- a/charts/controller_manager/templates/daemonset.yaml
+++ b/charts/controller_manager/templates/daemonset.yaml
@@ -16,7 +16,6 @@ limitations under the License.
 
 {{- if .Values.manifests.controller_manager }}
 {{- $envAll := . }}
-{{- $dependencies := .Values.dependencies.controller_manager }}
 {{- $mounts_controller_manager := .Values.pod.mounts.controller_manager.controller_manager }}
 {{- $mounts_controller_manager_init := .Values.pod.mounts.controller_manager.init_container }}
 ---
@@ -45,8 +44,6 @@ spec:
         - key: CriticalAddonsOnly
           operator: Exists
       terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.controller_manager.timeout }}
-      initContainers:
-{{ tuple $envAll $dependencies $mounts_controller_manager_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: anchor
           image: {{ .Values.images.tags.anchor }}
diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml
index a8ecc5df..13831776 100644
--- a/charts/etcd/values.yaml
+++ b/charts/etcd/values.yaml
@@ -16,7 +16,6 @@ images:
   tags:
     etcd: quay.io/coreos/etcd:v3.2.7
     etcdctl: quay.io/coreos/etcd:v3.2.7
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   pull_policy: "IfNotPresent"
 
 labels:
diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index 9e3ab36b..c966c504 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -14,7 +14,7 @@ data:
     - dns
     - kubernetes
     - kubernetes-rbac
-    - ucp-platform
+    - ucp-services
 ---
 schema: armada/ChartGroup/v1
 metadata:
@@ -86,7 +86,7 @@ data:
 schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
-  name: ucp-platform
+  name: ucp-services
   layeringDefinition:
     abstract: false
     layer: site
@@ -104,6 +104,8 @@ data:
   release: helm-toolkit
   namespace: helm-toolkit
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values: {}
@@ -148,6 +150,8 @@ data:
   release: kubernetes-proxy
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -327,6 +331,8 @@ data:
   release: calico-etcd
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -444,6 +450,8 @@ data:
   release: calico
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -505,6 +513,8 @@ data:
   release: coredns
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -612,6 +622,8 @@ data:
   release: kubernetes-apiserver
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -689,6 +701,8 @@ data:
   release: kubernetes-controller-manager
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -750,6 +764,8 @@ data:
   release: kubernetes-scheduler
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -933,6 +949,8 @@ data:
   release: kubernetes-etcd
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -1023,6 +1041,8 @@ data:
   release: rbac
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   values: {}
   upgrade:
     no_hooks: true
@@ -1044,6 +1064,8 @@ data:
   release: promenade
   namespace: ucp
   timeout: 600
+  wait:
+    timeout: 600
   values:
     conf:
       paste:
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 2a897f69..43585e3e 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -16,7 +16,7 @@ data:
     - kubernetes-rbac
     - ceph
     - ucp-infra
-    - ucp-platform
+    - ucp-services
 ---
 schema: armada/ChartGroup/v1
 metadata:
@@ -113,18 +113,28 @@ data:
     - ucp-mariadb
     - ucp-memcached
     - ucp-keystone
+    - maas-postgresql
+    - maas
+    - ucp-etcd-rabbitmq
+    - ucp-rabbitmq
+    - ucp-barbican
+    - ingress
 ---
 schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
-  name: ucp-platform
+  name: ucp-services
   layeringDefinition:
     abstract: false
     layer: site
 data:
   description: UCP platform components
   chart_group:
+    - armada
+    - deckhand
+    - drydock
     - promenade
+    - shipyard
 ---
 schema: armada/Chart/v1
 metadata:
@@ -135,6 +145,8 @@ data:
   release: helm-toolkit
   namespace: helm-toolkit
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values: {}
@@ -143,8 +155,7 @@ data:
     location: https://git.openstack.org/openstack/openstack-helm
     subpath: helm-toolkit
     reference: master
-  dependencies:
-    - helm-toolkit
+  dependencies: []
 ---
 schema: armada/Chart/v1
 metadata:
@@ -180,6 +191,8 @@ data:
   release: kubernetes-proxy
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -197,7 +210,8 @@ data:
     type: local
     location: /etc/genesis/armada/assets/charts
     subpath: proxy
-  dependencies: []
+  dependencies:
+    - helm-toolkit
 ---
 schema: armada/Chart/v1
 metadata:
@@ -358,6 +372,8 @@ data:
   release: calico-etcd
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -475,6 +491,8 @@ data:
   release: calico
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -536,6 +554,8 @@ data:
   release: coredns
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -643,6 +663,8 @@ data:
   release: kubernetes-apiserver
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -720,6 +742,8 @@ data:
   release: kubernetes-controller-manager
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -781,6 +805,8 @@ data:
   release: kubernetes-scheduler
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -964,6 +990,8 @@ data:
   release: kubernetes-etcd
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   upgrade:
     no_hooks: true
   values:
@@ -1054,6 +1082,8 @@ data:
   release: rbac
   namespace: kube-system
   timeout: 600
+  wait:
+    timeout: 600
   values: {}
   upgrade:
     no_hooks: true
@@ -1072,6 +1102,8 @@ data:
   release: ceph
   namespace: ceph
   timeout: 3600
+  wait:
+    timeout: 3600
   install:
     no_hooks: false
   upgrade:
@@ -1168,6 +1200,8 @@ data:
   release: ucp-ceph-config
   namespace: ucp
   timeout: 3600
+  wait:
+    timeout: 3600
   install:
     no_hooks: false
   upgrade:
@@ -1228,6 +1262,9 @@ data:
     no_hooks: false
   upgrade:
     no_hooks: false
+  timeout: 3600
+  wait:
+    timeout: 3600
   values:
     images:
       tags:
@@ -1329,6 +1366,308 @@ data:
     - helm-toolkit
 ---
 schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: maas-postgresql
+data:
+  chart_name: maas-postgresql
+  release: maas-postgresql
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+    create: []
+  post:
+    delete: []
+    create: []
+  values:
+    development:
+      enabled: false
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: postgresql
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: maas
+data:
+  chart_name: maas
+  release: maas
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    images:
+      tags:
+        db_init: docker.io/postgres:9.5
+        db_sync: quay.io/attcomdev/maas-region:master
+        maas_rack: quay.io/attcomdev/maas-rack:master
+        maas_region: quay.io/attcomdev/maas-region:master
+        bootstrap: quay.io/attcomdev/maas-region:master
+        export_api_key: quay.io/attcomdev/maas-region:master
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    labels:
+      rack:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
+      region:
+        node_selector_key: ucp-control-plane
+        node_selector_value: enabled
+    network:
+      proxy:
+        node_port:
+          enabled: true
+          port: 31800
+      gui:
+        node_port:
+          enabled: true
+          port: 31900
+    conf:
+      drydock:
+        bootaction_url: http://${DRYDOCK_NODE_IP}:${DRYDOCK_NODE_PORT}/api/v1.0/bootactions/nodes/
+      maas:
+        credentials:
+          secret:
+            namespace: ucp
+        url:
+          maas_url: http://192.168.77.10:31900/MAAS
+        proxy:
+          proxy_enabled: 'false'
+        ntp:
+          use_external_only: 'false'
+          ntp_servers: ntp.ubuntu.com
+        dns:
+          require_dnssec: 'no'
+          dns_servers: 8.8.8.8
+    secrets:
+      maas_region:
+        value: 3858a12230ac3c915f300c664f12063f
+  source:
+    type: git
+    location: https://github.com/att-comdev/maas
+    subpath: charts/maas
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-etcd-rabbitmq
+data:
+  chart_name: ucp-etcd-rabbitmq
+  release: etcd-rabbitmq
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+  post:
+    delete: []
+    create: []
+  values:
+    pod:
+      replicas:
+        etcd: 1
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: etcd
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-rabbitmq
+data:
+  chart_name: ucp-rabbitmq
+  release: rabbitmq
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+  post:
+    delete: []
+    create: []
+  values:
+    pod:
+      replicas:
+        server: 1
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: rabbitmq
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-barbican
+data:
+  chart_name: ucp-barbican
+  release: barbican
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  pre:
+    delete: []
+  post:
+    delete: []
+    create: []
+  values:
+    pod:
+      replicas:
+        api: 1
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://git.openstack.org/openstack/openstack-helm
+    subpath: barbican
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ingress
+data:
+  chart_name: ingress
+  release: ingress
+  namespace: ucp
+  timeout: 600
+  wait:
+    timeout: 600
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://github.com/openstack/openstack-helm
+    subpath: ingress
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: deckhand
+data:
+  chart_name: deckhand
+  release: deckhand
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    images:
+      tags:
+        deckhand: quay.io/attcomdev/deckhand:master
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    conf:
+      deckhand:
+        DEFAULT:
+          debug: true
+          use_stderr: true
+          use_syslog: true
+        keystone_authtoken:
+          memcache_security_strategy: None
+  source:
+    type: git
+    location: https://github.com/att-comdev/deckhand
+    subpath: charts/deckhand
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: drydock
+data:
+  chart_name: drydock
+  release: drydock
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    images:
+      tags:
+        drydock: quay.io/attcomdev/drydock:master
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+        ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+        ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+        ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+        drydock_db_init: docker.io/postgres:9.5
+        drydock_db_sync: quay.io/attcomdev/drydock:master
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    network:
+      drydock:
+        node_port:
+          enabled: true
+          port: 31000
+    endpoints:
+      physicalprovisioner:
+        port:
+          api:
+            nodeport: 31000
+    conf:
+      drydock:
+        maasdriver:
+          maas_api_url: http://192.168.77.10:31900/MAAS/api/2.0/
+        plugins:
+          ingester: drydock_provisioner.ingester.plugins.yaml.YamlIngester
+  source:
+    type: git
+    location: https://github.com/att-comdev/drydock
+    subpath: charts/drydock
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: promenade
@@ -1340,6 +1679,8 @@ data:
   release: promenade
   namespace: ucp
   timeout: 600
+  wait:
+    timeout: 600
   values:
     conf:
       paste:
@@ -1366,4 +1707,89 @@ data:
     subpath: promenade
   dependencies:
     - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: armada
+data:
+  chart_name: armada
+  release: armada
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    images:
+      tags:
+        api: quay.io/attcomdev/armada:latest
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    network:
+      api:
+        node_port:
+          enabled: true
+          port: 31903
+  source:
+    type: git
+    location: https://github.com/att-comdev/armada
+    subpath: charts/armada
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: shipyard
+data:
+  chart_name: shipyard
+  release: shipyard
+  namespace: ucp
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    prod_environment: true
+    images:
+      tags:
+        airflow: quay.io/attcomdev/airflow:latest
+        shipyard: quay.io/attcomdev/shipyard:latest
+        dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+        shipyard_db_init: docker.io/postgres:9.5
+        shipyard_db_sync: docker.io/postgres:9.5
+        airflow_db_init: docker.io/postgres:9.5
+        airflow_db_sync: quay.io/attcomdev/airflow:latest
+        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+    network:
+      shipyard:
+        node_port: 31901
+        enable_node_port: true
+      airflow:
+        web:
+          node_port: 32080
+          enable_node_port: true
+    conf:
+      shipyard:
+        keystone_authtoken:
+          memcache_security_strategy: None
+  source:
+    type: git
+    location: https://github.com/att-comdev/shipyard
+    subpath: charts/shipyard
+    reference: master
+  dependencies:
+    - helm-toolkit
 ...
diff --git a/promenade/templates/include/utils.sh b/promenade/templates/include/utils.sh
index b7d7e638..d6523d08 100644
--- a/promenade/templates/include/utils.sh
+++ b/promenade/templates/include/utils.sh
@@ -187,7 +187,7 @@ function wait_for_pod_termination {
 
     NAMESPACE=$1
     POD_NAME=$2
-    SEC=${3:-120}
+    SEC=${3:-300}
 
     log Waiting $SEC seconds for termination of pod $POD_NAME
 
diff --git a/tools/g2/lib/registry.sh b/tools/g2/lib/registry.sh
index 12bfb789..9aa51f44 100644
--- a/tools/g2/lib/registry.sh
+++ b/tools/g2/lib/registry.sh
@@ -33,7 +33,7 @@ registry_populate() {
             continue
         fi
 
-        if ! docker pull "localhost:5000/${image}" &> /dev/null; then
+        if [[ ${image} =~ .*:(latest|master) ]] || ! docker pull "localhost:5000/${image}" &> /dev/null; then
             log Loading image "${image}" into local registry
             {
                 docker pull "${image}"
diff --git a/tools/g2/manifests/genesis.json b/tools/g2/manifests/genesis.json
index d0a09086..3dc48668 100644
--- a/tools/g2/manifests/genesis.json
+++ b/tools/g2/manifests/genesis.json
@@ -29,7 +29,7 @@
     }
   ],
   "vm": {
-    "memory": 16192,
+    "memory": 12288,
     "names": [
       "n0"
     ],