diff --git a/bundle.yaml b/bundle.yaml
index b0ab8fd7938e34b8929f3ea29270babb457cd1e7..5087f70d6028ff79c0957f2e5ac106d063bf1f96 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -9,35 +9,35 @@ series: xenial
 description: An eight-machine Kubernetes cluster, appropriate for production. Includes a three-machine etcd and ceph-mon cluster, a Kubernetes master, three Kubernetes worker nodes and a Kubernetes worker with GPUs. The Ceph (Luminous) cluster uses three nodes for Ceph Monitors and a Ceph OSD in LXD containers on each worker machine. Two Ceph MDSs provide redundant shared Ceph File System.
 
 # ----------------------------------------------------------------------
-parameters:
-
+#parameters:
+#
   # Constraints
-  cluster: &cluster                "kubernetes"
-  public-ip: &public_ip            "public-ip"
+#  cluster: &cluster                "kubernetes"
+#  public-ip: &public_ip            "public-ip"
 
 # ----------------------------------------------------------------------
 machines:
   "0":
     series: xenial
-    constraints: "tags=*cluster"
+    constraints: "tags=kubernetes"
   "1":
     series: xenial
-    constraints: "tags=*cluster"
+    constraints: "tags=kubernetes"
   "2":
     series: xenial
-    constraints: "tags=*cluster"
+    constraints: "tags=kubernetes"
   "3":
     series: xenial
-    constraints: "tags=*cluster"
+    constraints: "tags=kubernetes,public-ip"
   "4":
     series: xenial
-    constraints: "tags=*cluster"
+    constraints: "cores=4 mem=4G tags=kubernetes"
   "5":
     series: xenial
-    constraints: "tags=*cluster"
+    constraints: "cores=4 mem=4G tags=kubernetes"
   "6":
     series: xenial
-    constraints: "tags=*cluster"
+    constraints: "cores=4 mem=4G tags=kubernetes"
 
 # ----------------------------------------------------------------------
 services:
@@ -67,11 +67,11 @@ services:
     charm: cs:~containers/etcd
     # charm: cs:~containers/etcd-63
     num_units: 3
-    constraints: tags=*cluster
+    # constraints: tags=*cluster
     to:
-      - "0"
-      - "1"
-      - "2"
+      - "lxd:0"
+      - "lxd:1"
+      - "lxd:2"
 
   flannel:
     annotations:
@@ -88,7 +88,7 @@ services:
     charm: cs:~containers/kubeapi-load-balancer
     expose: true
     num_units: 1
-    constraints: tags=*cluster
+    # constraints: tags=*cluster
     bindings:
       "": space-os-mgmt
     to:
@@ -102,7 +102,7 @@ services:
     # charm: cs:~containers/kubernetes-master-78
     # charm: "cs:~tvansteenburgh/kubernetes-master"
     num_units: 1
-    constraints: tags=*cluster,*public_ip
+    #constraints: tags=*cluster,*public_ip
     options:
       channel: 1.9/stable
       authorization-mode: Node,RBAC
@@ -118,7 +118,7 @@ services:
     # charm: cs:~containers/kubernetes-worker-81
     expose: true
     num_units: 3
-    constraints: cores=4 mem=4G tags=*cluster
+    # constraints: cores=4 mem=4G tags=*cluster
     options:
       channel: 1.9/stable
     to:
@@ -141,9 +141,9 @@ services:
     bindings:
       "": space-os-mgmt
     options:
-      source: cloud:xenial-pike
+      # source: cloud:xenial-pike
     to:
-      - 'lxd:0'                         # lxd:etcd
+      - 'lxd:0'		# lxd:etcd
       - 'lxd:1'
       - 'lxd:2'
     annotations:
@@ -158,15 +158,14 @@ services:
       cluster: space-os-data
     options:
       osd-devices: /dev/mapper/mpatha /dev/mapper/mpathb /dev/mapper/mpathc /dev/mapper/mpathd
-      osd-reformat: 'yes'
       osd-max-backfills: 1
       osd-recovery-max-active: 1
       osd-journal-size: 10000
       use-syslog: True
-      source: cloud:xenial-pike
+      # source: cloud:xenial-pike
       # bluestore: True
     to:
-      - "4" # "on each kubernetes-worker"
+      - "4"		# "on each kubernetes-worker"
       - "5"
       - "6"
     annotations: