diff --git a/deployment_files/global/v1.0u/software/charts/kubernetes/container-networking/calico.yaml b/deployment_files/global/v1.0u/software/charts/kubernetes/container-networking/calico.yaml
index 448f4385..37c79870 100644
--- a/deployment_files/global/v1.0u/software/charts/kubernetes/container-networking/calico.yaml
+++ b/deployment_files/global/v1.0u/software/charts/kubernetes/container-networking/calico.yaml
@@ -25,20 +25,28 @@ metadata:
         path: .values.images
 
     # IP addresses
+    -
+      src:
+        schema: pegleg/CommonAddresses/v1
+        name: common-addresses
+        path: .kubernetes.api_service_ip
+      dest:
+        path: .values.conf.policy_controller.K8S_API
+        pattern: KUBERNETES_IP
     -
       src:
         schema: pegleg/CommonAddresses/v1
         name: common-addresses
         path: .calico.etcd.service_ip
       dest:
-        path: .values.etcd.service.ip
+        path: .values.endpoints.etcd.host_fqdn_override.default
     -
       src:
         schema: pegleg/CommonAddresses/v1
         name: common-addresses
         path: .kubernetes.pod_cidr
       dest:
-        path: .values.calico.pod_ip_cidr
+        path: .values.networking.podSubnet
 
     # Other site-specific configuration
     -
@@ -47,7 +55,7 @@ metadata:
         name: common-addresses
         path: .calico.ip_autodetection_method
       dest:
-        path: .values.calico.ip_autodetection_method
+        path: .values.conf.node.ip_autodetection_method
 
     # Certificates
     -
@@ -56,21 +64,21 @@ metadata:
         name: calico-etcd
         path: .
       dest:
-        path: .values.etcd.tls.ca
+        path: .values.endpoints.etcd.auth.client.tls.ca
     -
       src:
         schema: deckhand/Certificate/v1
         name: calico-node
         path: .
       dest:
-        path: .values.etcd.tls.cert
+        path: .values.endpoints.etcd.auth.client.tls.crt
     -
       src:
         schema: deckhand/CertificateKey/v1
         name: calico-node
         path: .
       dest:
-        path: .values.etcd.tls.key
+        path: .values.endpoints.etcd.auth.client.tls.key
 data:
   chart_name: calico
   release: kubernetes-calico
@@ -81,10 +89,70 @@ data:
   upgrade:
     no_hooks: true
   values:
-    calico:
-      ctl:
-        install_on_host: true
-    etcd:
-      service:
-        port: 6666
+    conf:
+      cni_network_config:
+        name: k8s-pod-network
+        cniVersion: 0.1.0
+        type: calico
+        etcd_endpoints: __ETCD_ENDPOINTS__
+        etcd_ca_cert_file: /etc/calico/pki/ca
+        etcd_cert_file: /etc/calico/pki/crt
+        etcd_key_file: /etc/calico/pki/key
+        log_level: debug
+        mtu: 1500
+        ipam:
+          type: calico-ipam
+        policy:
+          type: k8s
+          k8s_api_root: https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__
+          k8s_auth_token: __SERVICEACCOUNT_TOKEN__
+
+      policy_controller:
+        K8S_API: "https://KUBERNETES_IP:443"
+
+      node:
+        CALICO_STARTUP_LOGLEVEL: INFO
+        CLUSTER_TYPE:
+          - k8s
+          - bgp
+        IP_AUTODETECTION_METHOD: interface=ens3
+        WAIT_FOR_STORAGE: "true"
+
+    endpoints:
+      etcd:
+        hosts:
+          default: calico-etcd
+        scheme:
+          default: https
+
+    networking:
+      mtu: 1500
+    manifests:
+      daemonset_calico_etcd: false
+      job_image_repo_sync: false
+      service_calico_etcd: false
+  dependencies:
+    - calico-htk
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-htk
+  layeringDefinition:
+    abstract: false
+    layer: global
+  storagePolicy: cleartext
+  substitutions:
+    - src:
+        schema: pegleg/SoftwareVersions/v1
+        name: software-versions
+        path: .charts.kubernetes.calico.calico-htk
+      dest:
+        path: .source
+data:
+  chart_name: calico-htk
+  release: calico-htk
+  namespace: calico-htk
+  timeout: 100
+  values: {}
   dependencies: []
diff --git a/deployment_files/global/v1.0u/software/config/versions.yaml b/deployment_files/global/v1.0u/software/config/versions.yaml
index 5b2bfbe8..7ccd9a00 100644
--- a/deployment_files/global/v1.0u/software/config/versions.yaml
+++ b/deployment_files/global/v1.0u/software/config/versions.yaml
@@ -21,7 +21,7 @@ data:
           type: git
           location: https://github.com/att-comdev/promenade
           subpath: charts/etcd
-          reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+          reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
         etcd-htk:
           type: git
           location: https://github.com/openstack/openstack-helm
@@ -29,14 +29,19 @@ data:
           reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
         calico:
           type: git
-          location: https://github.com/att-comdev/promenade
-          subpath: charts/calico
-          reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+          location: https://github.com/openstack/openstack-helm-infra
+          subpath: calico
+          reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
+        calico-htk:
+          type: git
+          location: https://github.com/openstack/openstack-helm-infra
+          subpath: helm-toolkit
+          reference: f402171e42356bc1e805782f1d7f090ce1f6ab17
       apiserver:
         type: git
         location: https://github.com/att-comdev/promenade
         subpath: charts/apiserver
-        reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+        reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
       apiserver-htk:
         type: git
         location: https://github.com/openstack/openstack-helm
@@ -46,7 +51,7 @@ data:
         type: git
         location: https://github.com/att-comdev/promenade
         subpath: charts/controller_manager
-        reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+        reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
       controller-manager-htk:
         type: git
         location: https://github.com/openstack/openstack-helm
@@ -56,7 +61,7 @@ data:
         type: git
         location: https://github.com/att-comdev/promenade
         subpath: charts/coredns
-        reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+        reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
       coredns-htk:
         type: git
         location: https://github.com/openstack/openstack-helm
@@ -66,7 +71,7 @@ data:
         type: git
         location: https://github.com/att-comdev/promenade
         subpath: charts/haproxy
-        reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+        reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
       haproxy-htk:
         type: git
         location: https://github.com/openstack/openstack-helm
@@ -76,7 +81,7 @@ data:
         type: git
         location: https://github.com/att-comdev/promenade
         subpath: charts/etcd
-        reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+        reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
       etcd-htk:
         type: git
         location: https://github.com/openstack/openstack-helm
@@ -96,7 +101,7 @@ data:
         type: git
         location: https://github.com/att-comdev/promenade
         subpath: charts/proxy
-        reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+        reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
       proxy-htk:
         type: git
         location: https://github.com/openstack/openstack-helm
@@ -106,7 +111,7 @@ data:
         type: git
         location: https://github.com/att-comdev/promenade
         subpath: charts/scheduler
-        reference: 34e2992389b9ce2755ad62e27105a01e9767d6ea
+        reference: ccdaceabf30c8cd42661a95e05f72a630b5310a0
       scheduler-htk:
         type: git
         location: https://github.com/openstack/openstack-helm
@@ -288,7 +293,7 @@ data:
         subpath: helm-toolkit
         reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601
   files:
-    kubelet: https://dl.k8s.io/v1.8.6/kubernetes-node-linux-amd64.tar.gz
+    kubelet: https://dl.k8s.io/v1.10.2/kubernetes-node-linux-amd64.tar.gz
   images:
     ucp:
       armada:
@@ -396,37 +401,38 @@ data:
         image_repo_sync: docker.io/docker:17.07.0
     kubernetes:
       apiserver:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
-        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.8.6
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
+        apiserver: gcr.io/google_containers/hyperkube-amd64:v1.10.2
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
       controller-manager:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
-        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.8.6
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
+        controller_manager: gcr.io/google_containers/hyperkube-amd64:v1.10.2
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
       coredns:
         coredns: coredns/coredns:1.0.5
       haproxy:
         haproxy: haproxy:1.8.3
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
       etcd:
         etcd: quay.io/coreos/etcd:v3.2.14
         etcdctl: quay.io/coreos/etcd:v3.2.14
-      kubectl: gcr.io/google_containers/hyperkube-amd64:v1.8.6
+      kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
       pause: gcr.io/google_containers/pause-amd64:3.0
       scheduler:
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.8.6
-        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.8.6
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
+        scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
       proxy:
-        proxy: gcr.io/google_containers/hyperkube-amd64:v1.8.6
+        proxy: gcr.io/google_containers/hyperkube-amd64:v1.10.2
     calico:
       etcd:
         etcd: quay.io/coreos/etcd:v3.2.14
         etcdctl: quay.io/coreos/etcd:v3.2.14
       calico:
         cni: quay.io/calico/cni:v1.11.2
-        ctl: quay.io/calico/ctl:v1.6.3
+        ctl: quay.io/calico/ctl:v1.6.2
+        kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0
         node: quay.io/calico/node:v2.6.5
-        policy_controller: quay.io/calico/kube-controllers:v1.0.2
+        settings: quay.io/calico/ctl:v1.6.2
   packages:
     repositories:
       - name: docker