diff --git a/bono.yaml b/bono.yaml
index f0189cd..cc03838 100644
--- a/bono.yaml
+++ b/bono.yaml
@@ -23,26 +23,6 @@ parameters:
     constraints:
       - custom_constraint: neutron.network
         description: Must be a valid network ID
-  public_sig_net_id:
-    type: string
-    description: ID of public signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_id:
-    type: string
-    description: ID of private signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_cidr:
-    type: string
-    description: Private signaling network address (CIDR notation)
-    default: 192.168.1.0/24
-  private_sig_net_gateway:
-    type: string
-    description: Private signaling network gateway address
-    default: 192.168.1.254
   flavor:
     type: string
     description: Flavor to use
@@ -64,9 +44,6 @@ parameters:
   base_mgmt_security_group:
     type: string
     description: ID of base security group for all Clearwater nodes (managment)
-  bono_sig_security_group:
-    type: string
-    description: ID of security group for Bono nodes (signaling)
   repo_url:
     type: string
     description: URL for Clearwater repository
@@ -78,9 +55,6 @@ parameters:
   dns_mgmt_ip:
     type: string
     description: IP address for DNS server on management network
-  dns_sig_ip:
-    type: string
-    description: IP address for DNS server on signaling network
   dnssec_key:
     type: string
     description: DNSSEC private key (Base64-encoded)
@@ -111,19 +85,15 @@ resources:
       floating_network_id: { get_param: public_mgmt_net_id }
       port_id: { get_resource: mgmt_port }
 
-  sig_port:
-    type: OS::Neutron::Port
+  wait_condition:
+    type: OS::Heat::WaitCondition
     properties:
-      # Specify the network ID by string to work around OpenStack issues - see https://github.com/Metaswitch/clearwater-heat/issues/18.
-      network_id: { str_replace: { params: { x: { get_param: private_sig_net_id } }, template: x } }
-      security_groups:
-        - { get_param: bono_sig_security_group }
+      handle: {get_resource: wait_handle}
+      count: 1
+      timeout: 1200
 
-  sig_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_sig_net_id }
-      port_id: { get_resource: sig_port }
+  wait_handle:
+    type: OS::Heat::WaitConditionHandle
 
   server:
     type: OS::Nova::Server
@@ -134,7 +104,6 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: mgmt_port }
-        - port: { get_resource: sig_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -143,15 +112,11 @@ resources:
             __zone__: { get_param: zone }
             __public_mgmt_ip__: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
             __private_mgmt_ip__: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-            __public_sig_ip__: { get_attr: [ sig_floating_ip, floating_ip_address ] }
-            __private_sig_ip__: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
-            __private_sig_cidr__: { get_param: private_sig_net_cidr }
-            __private_sig_gateway__: { get_param: private_sig_net_gateway }
             __dns_mgmt_ip__: { get_param: dns_mgmt_ip }
-            __dns_sig_ip__: { get_param: dns_sig_ip }
             __dnssec_key__: { get_param: dnssec_key }
             __etcd_ip__ : { get_param: etcd_ip }
             __index__ : { get_param: index }
+            wc_notify: { get_attr: [wait_handle, curl_cli] }
           template: |
             #!/bin/bash
 
@@ -159,36 +124,8 @@ resources:
             exec > >(tee -a /var/log/clearwater-heat-bono.log) 2>&1
             set -x
 
-            # Set up the signaling network namespace on each boot by creating an init file and
-            # linking to it from runlevel 2 and 3
-            cat >/etc/init.d/signaling_namespace <<EOF
-            #!/bin/bash
-            # Create the signaling namespace and configure its interfaces.
-            set -e
-
-            # Exit if the namespace is already set up.
-            ip netns list | grep -q signaling && exit 0
-
-            # eth1 is the signaling interface (and eth0 is the management interface).
-            # We need to set eth1 up manually - only eth0 is automatically configured via DHCP.
-            ip netns add signaling
-            ip link set eth1 netns signaling
-            ip netns exec signaling ip link set dev lo up
-            ip netns exec signaling ip addr add __private_sig_ip__/$(echo __private_sig_cidr__ | cut -d / -f 2) dev eth1
-            ip netns exec signaling ip link set dev eth1 up
-            ip netns exec signaling ip route add default via __private_sig_gateway__
-            EOF
-
-            chmod a+x /etc/init.d/signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc2.d/S01signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc3.d/S01signaling_namespace
-
-            # Also set up the signaling namespace now.
-            /etc/init.d/signaling_namespace
-
             # Configure the APT software source.
-            echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list
-            curl -L http://repo.cw-ngv.com/repo_key | apt-key add -
+            echo 'deb http://artifacts.opnfv.org/functest/clearwater/debian ./' > /etc/apt/sources.list.d/clearwater.list
             apt-get update
 
             # Configure /etc/clearwater/local_config.
@@ -196,11 +133,8 @@ resources:
             etcd_ip=__etcd_ip__
             [ -n "$etcd_ip" ] || etcd_ip=__private_mgmt_ip__
             cat > /etc/clearwater/local_config << EOF
-            signaling_namespace=signaling
-            signaling_dns_server=__dns_sig_ip__
-            management_local_ip=__private_mgmt_ip__
-            local_ip=__private_sig_ip__
-            public_ip=__public_sig_ip__
+            local_ip=__private_mgmt_ip__
+            public_ip=__public_mgmt_ip__
             public_hostname=__index__.bono.__zone__
             etcd_cluster=$etcd_ip
             EOF
@@ -223,8 +157,8 @@ resources:
             while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF
             server __dns_mgmt_ip__
             update add bono-__index__.__zone__. 30 $(ip2rr __public_mgmt_ip__)
-            update add __index__.bono.__zone__. 30 $(ip2rr __public_sig_ip__)
-            update add __zone__. 30 $(ip2rr __public_sig_ip__)
+            update add __index__.bono.__zone__. 30 $(ip2rr __public_mgmt_ip__)
+            update add __zone__. 30 $(ip2rr __public_mgmt_ip__)
             update add __zone__. 30 NAPTR 0 0 "s" "SIP+D2T" "" _sip._tcp.__zone__.
             update add __zone__. 30 NAPTR 0 0 "s" "SIP+D2U" "" _sip._udp.__zone__.
             update add _sip._tcp.__zone__. 30 SRV 0 0 5060 __index__.bono.__zone__.
@@ -241,10 +175,19 @@ resources:
             # Use the DNS server.
             echo 'nameserver __dns_mgmt_ip__' > /etc/dnsmasq.resolv.conf
             echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq
-            mkdir -p /etc/netns/signaling
-            echo 'nameserver __dns_sig_ip__' > /etc/netns/signaling/resolv.conf
             service dnsmasq force-reload
 
+            for ((i=1;i<=10;i++)); do
+                monit summary
+                test -z "$(monit summary 2>&1 |sed '1,2d' |grep -v Running |grep -v Status\ ok )" && break || sleep 60
+            done
+            clearwater-etcdctl cluster-health
+            clearwater-etcdctl member list
+            cw-check_cluster_state
+            cw-check_config_sync
+
+            wc_notify --data-binary '{"status": "SUCCESS"}'
+
 outputs:
   public_mgmt_ip:
     description: IP address in public management network
@@ -252,9 +195,3 @@ outputs:
   private_mgmt_ip:
     description: IP address in private management network
     value: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-  public_sig_ip:
-    description: IP address in public signaling network
-    value: { get_attr: [ sig_floating_ip, floating_ip_address ] }
-  private_sig_ip:
-    description: IP address in private signaling network
-    value: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
diff --git a/clearwater.yaml b/clearwater.yaml
index a155c60..dd90cb7 100644
--- a/clearwater.yaml
+++ b/clearwater.yaml
@@ -37,41 +37,6 @@ parameters:
     type: string
     description: IP address of external DNS server on management network
     default: 8.8.8.8
-  public_sig_net_id:
-    type: string
-    description: ID of public signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_ip_version:
-    type: string
-    description: IP version (4 or 6) on the private signaling network
-    constraints:
-      - allowed_values:
-        - "4"
-        - "6"
-        description: Must be 4 (IPv4) or 6 (IPv6)
-    default: "4"
-  private_sig_net_cidr:
-    type: string
-    description: Private signaling network address (CIDR notation)
-    default: 192.168.1.0/24
-  private_sig_net_gateway:
-    type: string
-    description: Private signaling network gateway address
-    default: 192.168.1.254
-  private_sig_net_pool_start:
-    type: string
-    description: Start of private signaling network IP address pool
-    default: 192.168.1.1
-  private_sig_net_pool_end:
-    type: string
-    description: End of private signaling network IP address pool
-    default: 192.168.1.253
-  external_sig_dns_ip:
-    type: string
-    description: IP address of external DNS server on signaling network
-    default: 8.8.8.8
   flavor:
     type: string
     description: Flavor to use
@@ -151,18 +116,6 @@ resources:
       private_net_pool_end: { get_param: private_mgmt_net_pool_end }
       dns_ip: { get_param: external_mgmt_dns_ip }
 
-  sig_network:
-    type: ./network.yaml
-    properties:
-      public_net_id: { get_param: public_sig_net_id }
-      private_net_name: { str_replace: { params: { __stack__: { get_param: "OS::stack_name" } }, template: __stack__-private-signaling } }
-      private_net_ip_version: { get_param: private_sig_net_ip_version }
-      private_net_cidr: { get_param: private_sig_net_cidr }
-      private_net_gateway: { get_param: private_sig_net_gateway }
-      private_net_pool_start: { get_param: private_sig_net_pool_start }
-      private_net_pool_end: { get_param: private_sig_net_pool_end }
-      dns_ip: { get_param: external_sig_dns_ip }
-
   security_groups:
     type: ./security-groups.yaml
     properties:
@@ -173,18 +126,17 @@ resources:
     properties:
       public_mgmt_net_id: { get_param: public_mgmt_net_id }
       private_mgmt_net_id: { get_attr: [ mgmt_network, private_net ] }
-      public_sig_net_id: { get_param: public_sig_net_id }
-      private_sig_net_id: { get_attr: [ sig_network, private_net ] }
-      private_sig_net_cidr: { get_attr: [ sig_network, private_net_cidr ] }
       flavor: { get_param: flavor }
       image: { get_param: image }
       key_name: { get_param: key_name }
-      dns_security_group: { get_attr: [ security_groups, dns ] }
+      base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] }
       zone: { get_param: zone }
       dnssec_key: { get_param: dnssec_key }
+      dns_ip: { get_param: external_mgmt_dns_ip }
 
   ellis:
     type: ./ellis.yaml
+    depends_on: dns
     properties:
       public_mgmt_net_id: { get_param: public_mgmt_net_id }
       private_mgmt_net_id: { get_attr: [ mgmt_network, private_net ] }
@@ -192,7 +144,6 @@ resources:
       image: { get_param: image }
       key_name: { get_param: key_name }
       base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] }
-      ellis_mgmt_security_group: { get_attr: [ security_groups, ellis_mgmt ] }
       repo_url: { get_param: repo_url }
       zone: { get_param: zone }
       dn_range_start: { get_param: dn_range_start }
@@ -202,6 +153,7 @@ resources:
 
   bono:
     type: OS::Heat::ResourceGroup
+    depends_on: sprout
     properties:
       count: { get_param: bono_cluster_size }
       index_var: "__index__"
@@ -210,25 +162,20 @@ resources:
         properties:
           public_mgmt_net_id: { get_param: public_mgmt_net_id }
           private_mgmt_net_id: { get_attr: [ mgmt_network, private_net ] }
-          public_sig_net_id: { get_param: public_sig_net_id }
-          private_sig_net_id: { get_attr: [ sig_network, private_net ] }
-          private_sig_net_cidr: { get_attr: [ sig_network, private_net_cidr ] }
-          private_sig_net_gateway: { get_attr: [ sig_network, private_net_gateway ] }
           flavor: { get_param: flavor }
           image: { get_param: image }
           key_name: { get_param: key_name }
           base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] }
-          bono_sig_security_group: { get_attr: [ security_groups, bono_sig ] }
           repo_url: { get_param: repo_url }
           zone: { get_param: zone }
           dns_mgmt_ip: { get_attr: [ dns, private_mgmt_ip ] }
-          dns_sig_ip: { get_attr: [ dns, private_sig_ip ] }
           dnssec_key: { get_param: dnssec_key }
           etcd_ip: { get_attr: [ ellis, private_mgmt_ip ] }
           index: __index__
 
   sprout:
     type: OS::Heat::ResourceGroup
+    depends_on: vellum
     properties:
       count: { get_param: sprout_cluster_size }
       index_var: __index__
@@ -237,26 +184,20 @@ resources:
         properties:
           public_mgmt_net_id: { get_param: public_mgmt_net_id }
           private_mgmt_net_id: { get_attr: [ mgmt_network, private_net ] }
-          public_sig_net_id: { get_param: public_sig_net_id }
-          private_sig_net_id: { get_attr: [ sig_network, private_net ] }
-          private_sig_net_cidr: { get_attr: [ sig_network, private_net_cidr ] }
-          private_sig_net_gateway: { get_attr: [ sig_network, private_net_gateway ] }
           flavor: { get_param: flavor }
           image: { get_param: image }
           key_name: { get_param: key_name }
           base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] }
-          sprout_sig_outbound_security_group: { get_attr: [ security_groups, sprout_sig_outbound ] }
-          sprout_sig_inbound_security_group: { get_attr: [ security_groups, sprout_sig_inbound ] }
           repo_url: { get_param: repo_url }
           zone: { get_param: zone }
           dns_mgmt_ip: { get_attr: [ dns, private_mgmt_ip ] }
-          dns_sig_ip: { get_attr: [ dns, private_sig_ip ] }
           dnssec_key: { get_param: dnssec_key }
           etcd_ip: { get_attr: [ ellis, private_mgmt_ip ] }
           index: __index__
 
   homer:
     type: OS::Heat::ResourceGroup
+    depends_on: sprout
     properties:
       count: { get_param: homer_cluster_size }
       index_var: __index__
@@ -265,26 +206,20 @@ resources:
         properties:
           public_mgmt_net_id: { get_param: public_mgmt_net_id }
           private_mgmt_net_id: { get_attr: [ mgmt_network, private_net ] }
-          public_sig_net_id: { get_param: public_sig_net_id }
-          private_sig_net_id: { get_attr: [ sig_network, private_net ] }
-          private_sig_net_cidr: { get_attr: [ sig_network, private_net_cidr ] }
-          private_sig_net_gateway: { get_attr: [ sig_network, private_net_gateway ] }
           flavor: { get_param: flavor }
           image: { get_param: image }
           key_name: { get_param: key_name }
           base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] }
-          homer_mgmt_security_group: { get_attr: [ security_groups, homer_mgmt ] }
-          homer_sig_security_group: { get_attr: [ security_groups, homer_sig ] }
           repo_url: { get_param: repo_url }
           zone: { get_param: zone }
           dns_mgmt_ip: { get_attr: [ dns, private_mgmt_ip ] }
-          dns_sig_ip: { get_attr: [ dns, private_sig_ip ] }
           dnssec_key: { get_param: dnssec_key }
           etcd_ip: { get_attr: [ ellis, private_mgmt_ip ] }
           index: __index__
 
   dime:
     type: OS::Heat::ResourceGroup
+    depends_on: sprout
     properties:
       count: { get_param: dime_cluster_size }
       index_var: __index__
@@ -293,26 +228,20 @@ resources:
         properties:
           public_mgmt_net_id: { get_param: public_mgmt_net_id }
           private_mgmt_net_id: { get_attr: [ mgmt_network, private_net ] }
-          public_sig_net_id: { get_param: public_sig_net_id }
-          private_sig_net_id: { get_attr: [ sig_network, private_net ] }
-          private_sig_net_cidr: { get_attr: [ sig_network, private_net_cidr ] }
-          private_sig_net_gateway: { get_attr: [ sig_network, private_net_gateway ] }
           flavor: { get_param: flavor }
           image: { get_param: image }
           key_name: { get_param: key_name }
           base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] }
-          dime_mgmt_security_group: { get_attr: [ security_groups, dime_mgmt ] }
-          dime_sig_security_group: { get_attr: [ security_groups, dime_sig ] }
           repo_url: { get_param: repo_url }
           zone: { get_param: zone }
           dns_mgmt_ip: { get_attr: [ dns, private_mgmt_ip ] }
-          dns_sig_ip: { get_attr: [ dns, private_sig_ip ] }
           dnssec_key: { get_param: dnssec_key }
           etcd_ip: { get_attr: [ ellis, private_mgmt_ip ] }
           index: __index__
 
   vellum:
     type: OS::Heat::ResourceGroup
+    depends_on: ellis
     properties:
       count: { get_param: vellum_cluster_size }
       index_var: __index__
@@ -321,20 +250,13 @@ resources:
         properties:
           public_mgmt_net_id: { get_param: public_mgmt_net_id }
           private_mgmt_net_id: { get_attr: [ mgmt_network, private_net ] }
-          public_sig_net_id: { get_param: public_sig_net_id }
-          private_sig_net_id: { get_attr: [ sig_network, private_net ] }
-          private_sig_net_cidr: { get_attr: [ sig_network, private_net_cidr ] }
-          private_sig_net_gateway: { get_attr: [ sig_network, private_net_gateway ] }
           flavor: { get_param: flavor }
           image: { get_param: image }
           key_name: { get_param: key_name }
           base_mgmt_security_group: { get_attr: [ security_groups, base_mgmt ] }
-          vellum_sig_outbound_security_group: { get_attr: [ security_groups, vellum_sig_outbound ] }
-          vellum_sig_inbound_security_group: { get_attr: [ security_groups, vellum_sig_inbound ] }
           repo_url: { get_param: repo_url }
           zone: { get_param: zone }
           dns_mgmt_ip: { get_attr: [ dns, private_mgmt_ip ] }
-          dns_sig_ip: { get_attr: [ dns, private_sig_ip ] }
           dnssec_key: { get_param: dnssec_key }
           etcd_ip: { get_attr: [ ellis, private_mgmt_ip ] }
           index: __index__
diff --git a/dime.yaml b/dime.yaml
index 642f19d..d2b8b92 100644
--- a/dime.yaml
+++ b/dime.yaml
@@ -23,26 +23,6 @@ parameters:
     constraints:
       - custom_constraint: neutron.network
         description: Must be a valid network ID
-  public_sig_net_id:
-    type: string
-    description: ID of public signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_id:
-    type: string
-    description: ID of private signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_cidr:
-    type: string
-    description: Private signaling network address (CIDR notation)
-    default: 192.168.1.0/24
-  private_sig_net_gateway:
-    type: string
-    description: Private signaling network gateway address
-    default: 192.168.1.254
   flavor:
     type: string
     description: Flavor to use
@@ -64,12 +44,6 @@ parameters:
   base_mgmt_security_group:
     type: string
     description: ID of base security group for all Clearwater nodes (management)
-  dime_sig_security_group:
-    type: string
-    description: ID of security group for Dime nodes (signaling)
-  dime_mgmt_security_group:
-    type: string
-    description: ID of security group for Dime nodes (management)
   repo_url:
     type: string
     description: URL for Clearwater repository
@@ -81,9 +55,6 @@ parameters:
   dns_mgmt_ip:
     type: string
     description: IP address for DNS server on management network
-  dns_sig_ip:
-    type: string
-    description: IP address for DNS server on signaling network
   dnssec_key:
     type: string
     description: DNSSEC private key (Base64-encoded)
@@ -107,7 +78,6 @@ resources:
       network_id: { str_replace: { params: { x: { get_param: private_mgmt_net_id } }, template: x } }
       security_groups:
         - { get_param: base_mgmt_security_group }
-        - { get_param: dime_mgmt_security_group }
 
   mgmt_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -115,13 +85,15 @@ resources:
       floating_network_id: { get_param: public_mgmt_net_id }
       port_id: { get_resource: mgmt_port }
 
-  sig_port:
-    type: OS::Neutron::Port
+  wait_condition:
+    type: OS::Heat::WaitCondition
     properties:
-      # Specify the network ID by string to work around OpenStack issues - see https://github.com/Metaswitch/clearwater-heat/issues/18.
-      network_id: { str_replace: { params: { x: { get_param: private_sig_net_id } }, template: x } }
-      security_groups:
-        - { get_param: dime_sig_security_group }
+      handle: {get_resource: wait_handle}
+      count: 1
+      timeout: 1200
+
+  wait_handle:
+    type: OS::Heat::WaitConditionHandle
 
   server:
     type: OS::Nova::Server
@@ -132,7 +104,6 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: mgmt_port }
-        - port: { get_resource: sig_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -141,14 +112,11 @@ resources:
             __zone__: { get_param: zone }
             __public_mgmt_ip__: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
             __private_mgmt_ip__: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-            __private_sig_ip__: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
-            __private_sig_cidr__: { get_param: private_sig_net_cidr }
-            __private_sig_gateway__: { get_param: private_sig_net_gateway }
             __dns_mgmt_ip__: { get_param: dns_mgmt_ip }
-            __dns_sig_ip__: { get_param: dns_sig_ip }
             __dnssec_key__: { get_param: dnssec_key }
             __etcd_ip__ : { get_param: etcd_ip }
             __index__ : { get_param: index }
+            wc_notify: { get_attr: [wait_handle, curl_cli] }
           template: |
             #!/bin/bash
 
@@ -156,36 +124,8 @@ resources:
             exec > >(tee -a /var/log/clearwater-heat-dime.log) 2>&1
             set -x
 
-            # Set up the signaling network namespace on each boot by creating an init file and
-            # linking to it from runlevel 2 and 3
-            cat >/etc/init.d/signaling_namespace <<EOF
-            #!/bin/bash
-            # Create the signaling namespace and configure its interfaces.
-            set -e
-
-            # Exit if the namespace is already set up.
-            ip netns list | grep -q signaling && exit 0
-
-            # eth1 is the signaling interface (and eth0 is the management interface).
-            # We need to set eth1 up manually - only eth0 is automatically configured via DHCP.
-            ip netns add signaling
-            ip link set eth1 netns signaling
-            ip netns exec signaling ip link set dev lo up
-            ip netns exec signaling ip addr add __private_sig_ip__/$(echo __private_sig_cidr__ | cut -d / -f 2) dev eth1
-            ip netns exec signaling ip link set dev eth1 up
-            ip netns exec signaling ip route add default via __private_sig_gateway__
-            EOF
-
-            chmod a+x /etc/init.d/signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc2.d/S01signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc3.d/S01signaling_namespace
-
-            # Also set up the signaling namespace now.
-            /etc/init.d/signaling_namespace
-
             # Configure the APT software source.
-            echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list
-            curl -L http://repo.cw-ngv.com/repo_key | apt-key add -
+            echo 'deb http://artifacts.opnfv.org/functest/clearwater/debian ./' > /etc/apt/sources.list.d/clearwater.list
             apt-get update
 
             # Configure /etc/clearwater/local_config.
@@ -193,11 +133,8 @@ resources:
             etcd_ip=__etcd_ip__
             [ -n "$etcd_ip" ] || etcd_ip=__private_mgmt_ip__
             cat > /etc/clearwater/local_config << EOF
-            signaling_namespace=signaling
-            signaling_dns_server=__dns_sig_ip__
-            management_local_ip=__private_mgmt_ip__
-            local_ip=__private_sig_ip__
-            public_ip=__private_sig_ip__
+            local_ip=__private_mgmt_ip__
+            public_ip=__private_mgmt_ip__
             public_hostname=dime-__index__.__zone__
             etcd_cluster=$etcd_ip
             EOF
@@ -220,9 +157,9 @@ resources:
             while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF
             server __dns_mgmt_ip__
             update add dime-__index__.__zone__. 30 $(ip2rr __public_mgmt_ip__)
-            update add ralf.__zone__. 30 $(ip2rr __private_sig_ip__)
-            update add hs.__zone__. 30 $(ip2rr __private_sig_ip__)
-            update add hs-prov.__zone__. 30 $(ip2rr __private_mgmt_ip__)
+            update add ralf.__zone__. 30 $(ip2rr __public_mgmt_ip__)
+            update add hs.__zone__. 30 $(ip2rr __public_mgmt_ip__)
+            update add hs-prov.__zone__. 30 $(ip2rr __public_mgmt_ip__)
             send
             EOF
             } && [ $retries -lt 10 ]
@@ -235,17 +172,22 @@ resources:
             # Use the DNS server.
             echo 'nameserver __dns_mgmt_ip__' > /etc/dnsmasq.resolv.conf
             echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq
-            mkdir -p /etc/netns/signaling
-            echo 'nameserver __dns_sig_ip__' > /etc/netns/signaling/resolv.conf
             service dnsmasq force-reload
 
+            for ((i=1;i<=10;i++)); do
+                monit summary
+                test -z "$(monit summary 2>&1 |sed '1,2d' |grep -v Running |grep -v Status\ ok )" && break || sleep 60
+            done
+            clearwater-etcdctl cluster-health
+            clearwater-etcdctl member list
+            cw-check_config_sync
+
+            wc_notify --data-binary '{"status": "SUCCESS"}'
+
 outputs:
   public_mgmt_ip:
     description: IP address in public (management) network
     value: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
   private_mgmt_ip:
-    description: IP address in private signaling network
+    description: IP address in private management network
     value: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-  private_sig_ip:
-    description: IP address in private signaling network
-    value: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
diff --git a/dns.yaml b/dns.yaml
index 825ede1..f98ffa3 100644
--- a/dns.yaml
+++ b/dns.yaml
@@ -23,22 +23,6 @@ parameters:
     constraints:
       - custom_constraint: neutron.network
         description: Must be a valid network ID
-  public_sig_net_id:
-    type: string
-    description: ID of public signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_id:
-    type: string
-    description: ID of private signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_cidr:
-    type: string
-    description: Private signaling network address (CIDR notation)
-    default: 192.168.1.0/24
   flavor:
     type: string
     description: Flavor to use
@@ -57,7 +41,7 @@ parameters:
     constraints:
       - custom_constraint: nova.keypair
         description: Must be a valid keypair name
-  dns_security_group:
+  base_mgmt_security_group:
     type: string
     description: ID of security group for DNS nodes
   zone:
@@ -67,6 +51,10 @@ parameters:
   dnssec_key:
     type: string
     description: DNSSEC private key (Base64-encoded)
+  dns_ip:
+    type: string
+    description: IP address of DNS server
+    default: 8.8.8.8
 
 resources:
   mgmt_port:
@@ -75,7 +63,7 @@ resources:
       # Specify the network ID by string to work around OpenStack issues - see https://github.com/Metaswitch/clearwater-heat/issues/18.
       network_id: { str_replace: { params: { x: { get_param: private_mgmt_net_id } }, template: x } }
       security_groups:
-        - { get_param: dns_security_group }
+        - { get_param: base_mgmt_security_group }
 
   mgmt_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -83,13 +71,15 @@ resources:
       floating_network_id: { get_param: public_mgmt_net_id }
       port_id: { get_resource: mgmt_port }
 
-  sig_port:
-    type: OS::Neutron::Port
+  wait_condition:
+    type: OS::Heat::WaitCondition
     properties:
-      # Specify the network ID by string to work around OpenStack issues - see https://github.com/Metaswitch/clearwater-heat/issues/18.
-      network_id: { str_replace: { params: { x: { get_param: private_sig_net_id } }, template: x } }
-      security_groups:
-        - { get_param: dns_security_group }
+      handle: {get_resource: wait_handle}
+      count: 1
+      timeout: 1200
+
+  wait_handle:
+    type: OS::Heat::WaitConditionHandle
 
   server:
     type: OS::Nova::Server
@@ -100,16 +90,15 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: mgmt_port }
-        - port: { get_resource: sig_port }
       user_data_format: RAW
       user_data:
         str_replace:
           params:
             __zone__: { get_param: zone }
             __dnssec_key__: { get_param: dnssec_key }
+            __dns_ip__: { get_param: dns_ip }
             __public_ip__: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
-            __private_sig_ip__: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
-            __private_sig_cidr__: { get_param: private_sig_net_cidr }
+            wc_notify: { get_attr: [wait_handle, curl_cli] }
           template: |
             #!/bin/bash
 
@@ -117,14 +106,22 @@ resources:
             exec > >(tee -a /var/log/clearwater-heat-dns.log) 2>&1
             set -x
 
-            # Set up the signaling network interface
-            ip addr add __private_sig_ip__/$(echo __private_sig_cidr__ | cut -d / -f 2) dev eth1
-            ip link set dev eth1 up
-
             # Install BIND.
             apt-get update
             DEBIAN_FRONTEND=noninteractive apt-get install bind9 --yes
 
+            cat > /etc/bind/named.conf.options << EOF
+            options {
+              directory "/var/cache/bind";
+              forwarders {
+                __dns_ip__;
+              };
+              dnssec-validation auto;
+              auth-nxdomain no;
+              listen-on-v6 { any; };
+            };
+            EOF
+
             # Update BIND configuration with the specified zone and key.
             cat >> /etc/bind/named.conf.local << EOF
             key __zone__. {
@@ -163,6 +160,8 @@ resources:
             # Now that BIND configuration is correct, kick it to reload.
             service bind9 reload
 
+            wc_notify --data-binary '{"status": "SUCCESS"}'
+
 outputs:
   public_mgmt_ip:
     description: IP address in public management network
@@ -170,9 +169,6 @@ outputs:
   private_mgmt_ip:
     description: IP address in private signaling network
     value: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-  private_sig_ip:
-    description: IP address in private signaling network
-    value: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
   zone:
     description: DNS zone
     value: { get_param: zone }
diff --git a/ellis.yaml b/ellis.yaml
index 963352d..2bd0730 100644
--- a/ellis.yaml
+++ b/ellis.yaml
@@ -44,9 +44,6 @@ parameters:
   base_mgmt_security_group:
     type: string
     description: ID of base security group for all Clearwater nodes (management)
-  ellis_mgmt_security_group:
-    type: string
-    description: ID of security group for Ellis nodes (management)
   repo_url:
     type: string
     description: URL for Clearwater repository
@@ -95,7 +92,6 @@ resources:
       network_id: { str_replace: { params: { x: { get_param: private_mgmt_net_id } }, template: x } }
       security_groups:
         - { get_param: base_mgmt_security_group }
-        - { get_param: ellis_mgmt_security_group }
 
   mgmt_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -103,6 +99,16 @@ resources:
       floating_network_id: { get_param: public_mgmt_net_id }
       port_id: { get_resource: mgmt_port }
 
+  wait_condition:
+    type: OS::Heat::WaitCondition
+    properties:
+      handle: {get_resource: wait_handle}
+      count: 1
+      timeout: 1200
+
+  wait_handle:
+    type: OS::Heat::WaitConditionHandle
+
   server:
     type: OS::Nova::Server
     properties:
@@ -126,6 +132,7 @@ resources:
             __dnssec_key__: { get_param: dnssec_key }
             __etcd_ip__ : { get_param: etcd_ip }
             __index__ : { get_param: index }
+            wc_notify: { get_attr: [wait_handle, curl_cli] }
           template: |
             #!/bin/bash
 
@@ -134,8 +141,7 @@ resources:
             set -x
 
             # Configure the APT software source.
-            echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list
-            curl -L http://repo.cw-ngv.com/repo_key | apt-key add -
+            echo 'deb http://artifacts.opnfv.org/functest/clearwater/debian ./' > /etc/apt/sources.list.d/clearwater.list
             apt-get update
 
             # Configure /etc/clearwater/local_config.  Add xdms_hostname here to use Homer's management
@@ -176,7 +182,7 @@ resources:
             chronos_hostname=vellum.__zone__
             ralf_session_store=vellum.__zone__
 
-            upstream_port=0
+            upstream_hostname=sprout.__zone__
 
             # Email server configuration
             smtp_smarthost=localhost
@@ -189,6 +195,8 @@ resources:
             turn_workaround=secret
             ellis_api_key=secret
             ellis_cookie_key=secret
+
+            reduce_cassandra_mem_usage=Y
             EOF
             /usr/share/clearwater/clearwater-config-manager/scripts/cw-config upload shared_config --autoconfirm --dir /tmp
 
@@ -197,7 +205,6 @@ resources:
             # local_settings.py runs to pick up the configuration changes.
             service clearwater-infrastructure restart
             service ellis stop
-            /usr/share/clearwater/ellis/env/bin/python /usr/share/clearwater/ellis/src/metaswitch/ellis/tools/create_numbers.py --start __dn_range_start__ --count __dn_range_length__ --realm __zone__
 
             # Function to give DNS record type and IP address for specified IP address
             ip2rr() {
@@ -228,6 +235,18 @@ resources:
             echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq
             service dnsmasq force-reload
 
+            for ((i=1;i<=10;i++)); do
+                monit summary
+                test -z "$(monit summary 2>&1 |sed '1,2d' |grep -v Running |grep -v Status\ ok )" && break || sleep 60
+            done
+            clearwater-etcdctl cluster-health
+            clearwater-etcdctl member list
+            cw-check_config_sync
+
+            /usr/share/clearwater/ellis/env/bin/python /usr/share/clearwater/ellis/src/metaswitch/ellis/tools/create_numbers.py --start __dn_range_start__ --count __dn_range_length__ --realm __zone__
+
+            wc_notify --data-binary '{"status": "SUCCESS"}'
+
 outputs:
   public_mgmt_ip:
     description: IP address in public management network
diff --git a/homer.yaml b/homer.yaml
index 4337984..d23adb5 100644
--- a/homer.yaml
+++ b/homer.yaml
@@ -23,26 +23,6 @@ parameters:
     constraints:
       - custom_constraint: neutron.network
         description: Must be a valid network ID
-  public_sig_net_id:
-    type: string
-    description: ID of public signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_id:
-    type: string
-    description: ID of private signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_cidr:
-    type: string
-    description: Private signaling network address (CIDR notation)
-    default: 192.168.1.0/24
-  private_sig_net_gateway:
-    type: string
-    description: Private signaling network gateway address
-    default: 192.168.1.254
   flavor:
     type: string
     description: Flavor to use
@@ -64,12 +44,6 @@ parameters:
   base_mgmt_security_group:
     type: string
     description: ID of base security group for all Clearwater nodes (management)
-  homer_mgmt_security_group:
-    type: string
-    description: ID of security group for Homer nodes (maangement)
-  homer_sig_security_group:
-    type: string
-    description: ID of security group for Homer nodes (signaling)
   repo_url:
     type: string
     description: URL for Clearwater repository
@@ -81,9 +55,6 @@ parameters:
   dns_mgmt_ip:
     type: string
     description: IP address for DNS server on management network
-  dns_sig_ip:
-    type: string
-    description: IP address for DNS server on signaling network
   dnssec_key:
     type: string
     description: DNSSEC private key (Base64-encoded)
@@ -107,7 +78,6 @@ resources:
       network_id: { str_replace: { params: { x: { get_param: private_mgmt_net_id } }, template: x } }
       security_groups:
         - { get_param: base_mgmt_security_group }
-        - { get_param: homer_mgmt_security_group }
 
   mgmt_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -115,19 +85,15 @@ resources:
       floating_network_id: { get_param: public_mgmt_net_id }
       port_id: { get_resource: mgmt_port }
 
-  sig_port:
-    type: OS::Neutron::Port
+  wait_condition:
+    type: OS::Heat::WaitCondition
     properties:
-      # Specify the network ID by string to work around OpenStack issues - see https://github.com/Metaswitch/clearwater-heat/issues/18.
-      network_id: { str_replace: { params: { x: { get_param: private_sig_net_id } }, template: x } }
-      security_groups:
-        - { get_param: homer_sig_security_group }
+      handle: {get_resource: wait_handle}
+      count: 1
+      timeout: 1200
 
-  sig_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_sig_net_id }
-      port_id: { get_resource: sig_port }
+  wait_handle:
+    type: OS::Heat::WaitConditionHandle
 
   server:
     type: OS::Nova::Server
@@ -138,7 +104,6 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: mgmt_port }
-        - port: { get_resource: sig_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -147,15 +112,11 @@ resources:
             __zone__: { get_param: zone }
             __public_mgmt_ip__: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
             __private_mgmt_ip__: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-            __public_sig_ip__: { get_attr: [ sig_floating_ip, floating_ip_address ] }
-            __private_sig_ip__: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
-            __private_sig_cidr__: { get_param: private_sig_net_cidr }
-            __private_sig_gateway__: { get_param: private_sig_net_gateway }
             __dns_mgmt_ip__: { get_param: dns_mgmt_ip }
-            __dns_sig_ip__: { get_param: dns_sig_ip }
             __dnssec_key__: { get_param: dnssec_key }
             __etcd_ip__ : { get_param: etcd_ip }
             __index__ : { get_param: index }
+            wc_notify: { get_attr: [wait_handle, curl_cli] }
           template: |
             #!/bin/bash
 
@@ -163,36 +124,8 @@ resources:
             exec > >(tee -a /var/log/clearwater-heat-homer.log) 2>&1
             set -x
 
-            # Set up the signaling network namespace on each boot by creating an init file and
-            # linking to it from runlevel 2 and 3
-            cat >/etc/init.d/signaling_namespace <<EOF
-            #!/bin/bash
-            # Create the signaling namespace and configure its interfaces.
-            set -e
-
-            # Exit if the namespace is already set up.
-            ip netns list | grep -q signaling && exit 0
-
-            # eth1 is the signaling interface (and eth0 is the management interface).
-            # We need to set eth1 up manually - only eth0 is automatically configured via DHCP.
-            ip netns add signaling
-            ip link set eth1 netns signaling
-            ip netns exec signaling ip link set dev lo up
-            ip netns exec signaling ip addr add __private_sig_ip__/$(echo __private_sig_cidr__ | cut -d / -f 2) dev eth1
-            ip netns exec signaling ip link set dev eth1 up
-            ip netns exec signaling ip route add default via __private_sig_gateway__
-            EOF
-
-            chmod a+x /etc/init.d/signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc2.d/S01signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc3.d/S01signaling_namespace
-
-            # Also set up the signaling namespace now.
-            /etc/init.d/signaling_namespace
-
             # Configure the APT software source.
-            echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list
-            curl -L http://repo.cw-ngv.com/repo_key | apt-key add -
+            echo 'deb http://artifacts.opnfv.org/functest/clearwater/debian ./' > /etc/apt/sources.list.d/clearwater.list
             apt-get update
 
             # Configure /etc/clearwater/local_config.
@@ -200,11 +133,8 @@ resources:
             etcd_ip=__etcd_ip__
             [ -n "$etcd_ip" ] || etcd_ip=__private_mgmt_ip__
             cat > /etc/clearwater/local_config << EOF
-            signaling_namespace=signaling
-            signaling_dns_server=__dns_sig_ip__
-            management_local_ip=__private_mgmt_ip__
-            local_ip=__private_sig_ip__
-            public_ip=__public_sig_ip__
+            local_ip=__private_mgmt_ip__
+            public_ip=__public_mgmt_ip__
             public_hostname=homer-__index__.__zone__
             etcd_cluster=$etcd_ip
             EOF
@@ -227,7 +157,7 @@ resources:
             while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF
             server __dns_mgmt_ip__
             update add homer-__index__.__zone__. 30 $(ip2rr __public_mgmt_ip__)
-            update add homer.__zone__. 30 $(ip2rr __public_sig_ip__)
+            update add homer.__zone__. 30 $(ip2rr __public_mgmt_ip__)
             send
             EOF
             } && [ $retries -lt 10 ]
@@ -237,14 +167,22 @@ resources:
               sleep 5
             done
 
-            # Use the DNS server.
             # Use the DNS server.
             echo 'nameserver __dns_mgmt_ip__' > /etc/dnsmasq.resolv.conf
             echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq
-            mkdir -p /etc/netns/signaling
-            echo 'nameserver __dns_sig_ip__' > /etc/netns/signaling/resolv.conf
             service dnsmasq force-reload
 
+            for ((i=1;i<=10;i++)); do
+                monit summary
+                test -z "$(monit summary 2>&1 |sed '1,2d' |grep -v Running |grep -v Status\ ok )" && break || sleep 60
+            done
+            clearwater-etcdctl cluster-health
+            clearwater-etcdctl member list
+            cw-check_cluster_state
+            cw-check_config_sync
+
+            wc_notify --data-binary '{"status": "SUCCESS"}'
+
 outputs:
   public_mgmt_ip:
     description: IP address in public management network
@@ -252,9 +190,3 @@ outputs:
   private_mgmt_ip:
     description: IP address in private management network
     value: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-  public_sig_ip:
-    description: IP address in public signaling network
-    value: { get_attr: [ sig_floating_ip, floating_ip_address ] }
-  private_sig_ip:
-    description: IP address in private signaling network
-    value: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
diff --git a/security-groups.yaml b/security-groups.yaml
index 5921d32..c73fe2b 100644
--- a/security-groups.yaml
+++ b/security-groups.yaml
@@ -32,340 +32,14 @@ resources:
         - protocol: icmp
         # SSH
         - protocol: tcp
-          port_range_min: 22
-          port_range_max: 22
+          port_range_min: 1
+          port_range_max: 65535
         # SNMP
         - protocol: udp
-          port_range_min: 161
-          port_range_max: 161
-        # etcd
-        - protocol: tcp
-          port_range_min: 2380
-          port_range_max: 2380
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: base_mgmt } # omit remote_group_id to reference yourself
-        - protocol: tcp
-          port_range_min: 4000
-          port_range_max: 4000
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: base_mgmt } # omit remote_group_id to reference yourself
-
-  dns:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-dns } }
-      description: Security group for DNS nodes
-      rules:
-        # All egress traffic
-        - direction: egress
-          ethertype: IPv4
-        - direction: egress
-          ethertype: IPv6
-        # ICMP
-        - protocol: icmp
-        # SSH
-        - protocol: tcp
-          port_range_min: 22
-          port_range_max: 22
-        # DNS
-        - protocol: udp
-          port_range_min: 53
-          port_range_max: 53
-        - protocol: tcp
-          port_range_min: 53
-          port_range_max: 53
-
-  ellis_mgmt:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-ellis-mgmt } }
-      description: Security group for Ellis nodes (management)
-      rules:
-        # HTTP
-        - protocol: tcp
-          port_range_min: 80
-          port_range_max: 80
-        # HTTPS
-        - protocol: tcp
-          port_range_min: 443
-          port_range_max: 443
-
-  bono_sig:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-bono-sig } }
-      description: Security group for Bono nodes (signaling)
-      rules:
-        # STUN/TURN
-        - protocol: udp
-          port_range_min: 3478
-          port_range_max: 3478
-        - protocol: tcp
-          port_range_min: 3478
-          port_range_max: 3478
-        # Internal SIP
-        - protocol: tcp
-          port_range_min: 5058
-          port_range_max: 5058
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: bono_sig } # omit remote_group_id to reference yourself
-        - protocol: tcp
-          port_range_min: 5058
-          port_range_max: 5058
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: sprout_sig_outbound }
-        # External SIP
-        - protocol: udp
-          port_range_min: 5060
-          port_range_max: 5060
-        - protocol: tcp
-          port_range_min: 5060
-          port_range_max: 5060
-        # External SIP/WebSocket
-        - protocol: tcp
-          port_range_min: 5062
-          port_range_max: 5062
-        # RTP
-        - protocol: udp
-          port_range_min: 32768
+          port_range_min: 1
           port_range_max: 65535
 
-
-  sprout_sig_outbound:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-sprout-sig-outbound } }
-      description: Security group for Sprout nodes outbound traffic (signaling)
-      rules:
-        # Internal SIP
-        - protocol: tcp
-          port_range_min: 5052
-          port_range_max: 5052
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: sprout_sig_outbound } # omit remote_group_id to reference yourself
-        - protocol: tcp
-          port_range_min: 5054
-          port_range_max: 5054
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: sprout_sig_outbound } # omit remote_group_id to reference yourself
-
-  sprout_sig_inbound:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-sprout-sig-inbound } }
-      description: Security group for Sprout nodes inbound traffic (signaling) 
-      rules:
-        # Internal SIP
-        - protocol: tcp
-          port_range_min: 5052
-          port_range_max: 5052
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: bono_sig }
-        - protocol: tcp
-          port_range_min: 5054
-          port_range_max: 5054
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: bono_sig }
-        # Chronos timer pops
-        - protocol: tcp
-          port_range_min: 9888
-          port_range_max: 9888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: vellum_sig_outbound }
-        # Notifications from Homestead
-        - protocol: tcp
-          port_range_min: 9888
-          port_range_max: 9888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: dime_sig }
-
-  homer_mgmt:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-homer-mgmt } }
-      description: Security group for Homer nodes (management)
-      rules:
-        # Ut/HTTP
-        - protocol: tcp
-          port_range_min: 7888
-          port_range_max: 7888
-        - protocol: tcp
-          port_range_min: 7888
-          port_range_max: 7888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: sprout_sig_outbound }
-
-  homer_sig:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-homer-sig } }
-      description: Security group for Homer nodes (signaling)
-      rules:
-        # Ut/HTTP
-        - protocol: tcp
-          port_range_min: 7888
-          port_range_max: 7888
-        - protocol: tcp
-          port_range_min: 7888
-          port_range_max: 7888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: sprout_sig_outbound }
-        - protocol: tcp
-          port_range_min: 9160
-          port_range_max: 9160
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: homer_sig } # omit remote_group_id to reference yourself
-
-  dime_mgmt:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-dime-mgmt } }
-      description: Security group for Dime nodes (management)
-      rules:
-        # REST-ful Provisioning API
-        - protocol: tcp
-          port_range_min: 8889
-          port_range_max: 8889
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: ellis_mgmt }
-
-  dime_sig:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-dime-sig } }
-      description: Security group for Dime nodes (signaling)
-      rules:
-        # Cx-like HTTP API
-        - protocol: tcp
-          port_range_min: 8888
-          port_range_max: 8888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: bono_sig }
-        - protocol: tcp
-          port_range_min: 8888
-          port_range_max: 8888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: sprout_sig_outbound }
-        # Rf-like/HTTP API
-        - protocol: tcp
-          port_range_min: 10888
-          port_range_max: 10888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: bono_sig }
-        - protocol: tcp
-          port_range_min: 10888
-          port_range_max: 10888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: sprout_sig_outbound }
-        # Chronos timer pops
-        - protocol: tcp
-          port_range_min: 10888
-          port_range_max: 10888
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: vellum_sig_outbound }
-
-  vellum_sig_outbound:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-vellum-sig-outbound } }
-      description: Security group for Vellum nodes outbound traffic (signaling)
-      rules:
-        # Chronos
-        - protocol: tcp
-          port_range_min: 7253
-          port_range_max: 7253
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: vellum_sig_outbound } # omit remote_group_id to reference yourself
-        # Cassandra
-        - protocol: tcp
-          port_range_min: 7000
-          port_range_max: 7000
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: vellum_sig_outbound } # omit remote_group_id to reference yourself
-        # Memcached listening to Astaire
-        - protocol: tcp
-          port_range_min: 11211
-          port_range_max: 11211
-          remote_mode: remote_group_id
-          #remote_group_id: { get_resource: vellum_sig_outbound } # omit remote_group_id to reference yourself
-
-  vellum_sig_inbound:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name: { str_replace: { params: { __name_prefix__: { get_param: "name_prefix" } }, template: __name_prefix__-vellum-sig-inbound } }
-      description: Security group for Vellum nodes inbound traffic (signaling)
-      rules:
-        # Astaire
-        - protocol: tcp
-          port_range_min: 11311
-          port_range_max: 11311
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: sprout_sig_outbound }
-        # Astaire 
-        - protocol: tcp
-          port_range_min: 11311
-          port_range_max: 11311
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: dime_sig }
-        # Chronos 
-        - protocol: tcp
-          port_range_min: 7253
-          port_range_max: 7253
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: sprout_sig_outbound }
-        # Chronos
-        - protocol: tcp
-          port_range_min: 7253
-          port_range_max: 7253
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: dime_sig }
-        # Cassandra Thrift
-        - protocol: tcp
-          port_range_min: 9160
-          port_range_max: 9160
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: dime_sig }
-        # Cassandra Thrift
-        - protocol: tcp
-          port_range_min: 9160
-          port_range_max: 9160
-          remote_mode: remote_group_id
-          remote_group_id: { get_resource: homer_sig }
-
 outputs:
   base_mgmt:
     description: Base security group for all Clearwater nodes (management)
-    value: { get_resource: base_mgmt } 
-  dns:
-    description: Security group for DNS nodes
-    value: { get_resource: dns }
-  ellis_mgmt:
-    description: Security group for Ellis nodes (managment)
-    value: { get_resource: ellis_mgmt }
-  bono_sig:
-    description: Security group for Bono nodes (signaling)
-    value: { get_resource: bono_sig }
-  sprout_sig_outbound:
-    description: Security group for Sprout nodes outbound traffic (signaling)
-    value: { get_resource: sprout_sig_outbound }
-  sprout_sig_inbound:
-    description: Security group for Sprout nodes inbound traffic (signaling)
-    value: { get_resource: sprout_sig_inbound }
-  homer_mgmt:
-    description: Security group for Homer nodes (management)
-    value: { get_resource: homer_mgmt }
-  homer_sig:
-    description: Security group for Homer nodes (signaling)
-    value: { get_resource: homer_sig }
-  dime_mgmt:
-    description: Security group for Dime nodes (management)
-    value: { get_resource: dime_mgmt }
-  dime_sig:
-    description: Security group for Dime nodes (signaling)
-    value: { get_resource: dime_sig }
-  vellum_sig_outbound:
-    description: Security group for Vellum nodes outbound traffic (signaling)
-    value: { get_resource: vellum_sig_outbound }
-  vellum_sig_inbound:
-    description: Security group for Vellum nodes inbound traffic (signaling)
-    value: { get_resource: vellum_sig_inbound }
+    value: { get_resource: base_mgmt }
diff --git a/sprout.yaml b/sprout.yaml
index 9c533b7..b51750b 100644
--- a/sprout.yaml
+++ b/sprout.yaml
@@ -23,26 +23,6 @@ parameters:
     constraints:
       - custom_constraint: neutron.network
         description: Must be a valid network ID
-  public_sig_net_id:
-    type: string
-    description: ID of public signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_id:
-    type: string
-    description: ID of private signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_cidr:
-    type: string
-    description: Private signaling network address (CIDR notation)
-    default: 192.168.1.0/24
-  private_sig_net_gateway:
-    type: string
-    description: Private signaling network gateway address
-    default: 192.168.1.254
   flavor:
     type: string
     description: Flavor to use
@@ -64,12 +44,6 @@ parameters:
   base_mgmt_security_group:
     type: string
     description: ID of base security group for all Clearwater nodes (management)
-  sprout_sig_outbound_security_group:
-    type: string
-    description: ID of security group for Sprout nodes outbound traffic (signaling)
-  sprout_sig_inbound_security_group:
-    type: string
-    description: ID of security group for Sprout nodes inbound traffic (signaling)
   repo_url:
     type: string
     description: URL for Clearwater repository
@@ -81,9 +55,6 @@ parameters:
   dns_mgmt_ip:
     type: string
     description: IP address for DNS server on management network
-  dns_sig_ip:
-    type: string
-    description: IP address for DNS server on signaling network
   dnssec_key:
     type: string
     description: DNSSEC private key (Base64-encoded)
@@ -114,14 +85,15 @@ resources:
       floating_network_id: { get_param: public_mgmt_net_id }
       port_id: { get_resource: mgmt_port }
 
-  sig_port:
-    type: OS::Neutron::Port
+  wait_condition:
+    type: OS::Heat::WaitCondition
     properties:
-      # Specify the network ID by string to work around OpenStack issues - see https://github.com/Metaswitch/clearwater-heat/issues/18.
-      network_id: { str_replace: { params: { x: { get_param: private_sig_net_id } }, template: x } }
-      security_groups:
-        - { get_param: sprout_sig_outbound_security_group }
-        - { get_param: sprout_sig_inbound_security_group }
+      handle: {get_resource: wait_handle}
+      count: 1
+      timeout: 1200
+
+  wait_handle:
+    type: OS::Heat::WaitConditionHandle
 
   server:
     type: OS::Nova::Server
@@ -132,7 +104,6 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: mgmt_port }
-        - port: { get_resource: sig_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -141,14 +112,11 @@ resources:
             __zone__: { get_param: zone }
             __public_mgmt_ip__: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
             __private_mgmt_ip__: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-            __private_sig_ip__: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
-            __private_sig_cidr__: { get_param: private_sig_net_cidr }
-            __private_sig_gateway__: { get_param: private_sig_net_gateway }
             __dns_mgmt_ip__: { get_param: dns_mgmt_ip }
-            __dns_sig_ip__: { get_param: dns_sig_ip }
             __dnssec_key__: { get_param: dnssec_key }
             __etcd_ip__ : { get_param: etcd_ip }
             __index__ : { get_param: index }
+            wc_notify: { get_attr: [wait_handle, curl_cli] }
           template: |
             #!/bin/bash
 
@@ -156,36 +124,8 @@ resources:
             exec > >(tee -a /var/log/clearwater-heat-sprout.log) 2>&1
             set -x
 
-            # Set up the signaling network namespace on each boot by creating an init file and
-            # linking to it from runlevel 2 and 3
-            cat >/etc/init.d/signaling_namespace <<EOF
-            #!/bin/bash
-            # Create the signaling namespace and configure its interfaces.
-            set -e
-
-            # Exit if the namespace is already set up.
-            ip netns list | grep -q signaling && exit 0
-
-            # eth1 is the signaling interface (and eth0 is the management interface).
-            # We need to set eth1 up manually - only eth0 is automatically configured via DHCP.
-            ip netns add signaling
-            ip link set eth1 netns signaling
-            ip netns exec signaling ip link set dev lo up
-            ip netns exec signaling ip addr add __private_sig_ip__/$(echo __private_sig_cidr__ | cut -d / -f 2) dev eth1
-            ip netns exec signaling ip link set dev eth1 up
-            ip netns exec signaling ip route add default via __private_sig_gateway__
-            EOF
-
-            chmod a+x /etc/init.d/signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc2.d/S01signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc3.d/S01signaling_namespace
-
-            # Also set up the signaling namespace now.
-            /etc/init.d/signaling_namespace
-
             # Configure the APT software source.
-            echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list
-            curl -L http://repo.cw-ngv.com/repo_key | apt-key add -
+            echo 'deb http://artifacts.opnfv.org/functest/clearwater/debian ./' > /etc/apt/sources.list.d/clearwater.list
             apt-get update
 
             # Configure /etc/clearwater/local_config.
@@ -193,11 +133,8 @@ resources:
             etcd_ip=__etcd_ip__
             [ -n "$etcd_ip" ] || etcd_ip=__private_mgmt_ip__
             cat > /etc/clearwater/local_config << EOF
-            signaling_namespace=signaling
-            signaling_dns_server=__dns_sig_ip__
-            management_local_ip=__private_mgmt_ip__
-            local_ip=__private_sig_ip__
-            public_ip=__private_sig_ip__
+            local_ip=__private_mgmt_ip__
+            public_ip=__private_mgmt_ip__
             public_hostname=__index__.sprout.__zone__
             etcd_cluster=$etcd_ip
             EOF
@@ -220,10 +157,10 @@ resources:
             while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF
             server __dns_mgmt_ip__
             update add sprout-__index__.__zone__. 30 $(ip2rr __public_mgmt_ip__)
-            update add __index__.sprout.__zone__. 30 $(ip2rr __private_sig_ip__)
-            update add sprout.__zone__. 30 $(ip2rr __private_sig_ip__)
-            update add scscf.sprout.__zone__. 30 $(ip2rr __private_sig_ip__)
-            update add icscf.sprout.__zone__. 30 $(ip2rr __private_sig_ip__)
+            update add __index__.sprout.__zone__. 30 $(ip2rr __public_mgmt_ip__)
+            update add sprout.__zone__. 30 $(ip2rr __public_mgmt_ip__)
+            update add scscf.sprout.__zone__. 30 $(ip2rr __public_mgmt_ip__)
+            update add icscf.sprout.__zone__. 30 $(ip2rr __public_mgmt_ip__)
             update add sprout.__zone__. 30 NAPTR 0 0 "s" "SIP+D2T" "" _sip._tcp.sprout.__zone__.
             update add _sip._tcp.sprout.__zone__. 30 SRV 0 0 5054 __index__.sprout.__zone__.
             update add icscf.sprout.__zone__. 30 NAPTR 0 0 "s" "SIP+D2T" "" _sip._tcp.icscf.sprout.__zone__.
@@ -242,17 +179,23 @@ resources:
             # Use the DNS server.
             echo 'nameserver __dns_mgmt_ip__' > /etc/dnsmasq.resolv.conf
             echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq
-            mkdir -p /etc/netns/signaling
-            echo 'nameserver __dns_sig_ip__' > /etc/netns/signaling/resolv.conf
             service dnsmasq force-reload
 
+            for ((i=1;i<=10;i++)); do
+                monit summary
+                test -z "$(monit summary 2>&1 |sed '1,2d' |grep -v Running |grep -v Status\ ok )" && break || sleep 60
+            done
+            clearwater-etcdctl cluster-health
+            clearwater-etcdctl member list
+            cw-check_cluster_state
+            cw-check_config_sync
+
+            wc_notify --data-binary '{"status": "SUCCESS"}'
+
 outputs:
   public_mgmt_ip:
     description: IP address in public (management) network
     value: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
   private_mgmt_ip:
-    description: IP address in private signaling network
+    description: IP address in private management network
     value: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-  private_sig_ip:
-    description: IP address in private signaling network
-    value: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
diff --git a/vellum.yaml b/vellum.yaml
index aab71f9..de15fcf 100644
--- a/vellum.yaml
+++ b/vellum.yaml
@@ -23,26 +23,6 @@ parameters:
     constraints:
       - custom_constraint: neutron.network
         description: Must be a valid network ID
-  public_sig_net_id:
-    type: string
-    description: ID of public signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_id:
-    type: string
-    description: ID of private signaling network
-    constraints:
-      - custom_constraint: neutron.network
-        description: Must be a valid network ID
-  private_sig_net_cidr:
-    type: string
-    description: Private signaling network address (CIDR notation)
-    default: 192.168.1.0/24
-  private_sig_net_gateway:
-    type: string
-    description: Private signaling network gateway address
-    default: 192.168.1.254
   flavor:
     type: string
     description: Flavor to use
@@ -64,12 +44,6 @@ parameters:
   base_mgmt_security_group:
     type: string
     description: ID of base security group for all Clearwater nodes (management)
-  vellum_sig_outbound_security_group:
-    type: string
-    description: ID of security group for Vellum nodes outbound traffic (signaling)
-  vellum_sig_inbound_security_group:
-    type: string
-    description: ID of security group for Vellum nodes inbound traffic (signaling)
   repo_url:
     type: string
     description: URL for Clearwater repository
@@ -81,9 +55,6 @@ parameters:
   dns_mgmt_ip:
     type: string
     description: IP address for DNS server on management network
-  dns_sig_ip:
-    type: string
-    description: IP address for DNS server on signaling network
   dnssec_key:
     type: string
     description: DNSSEC private key (Base64-encoded)
@@ -114,14 +85,15 @@ resources:
       floating_network_id: { get_param: public_mgmt_net_id }
       port_id: { get_resource: mgmt_port }
 
-  sig_port:
-    type: OS::Neutron::Port
+  wait_condition:
+    type: OS::Heat::WaitCondition
     properties:
-      # Specify the network ID by string to work around OpenStack issues - see https://github.com/Metaswitch/clearwater-heat/issues/18.
-      network_id: { str_replace: { params: { x: { get_param: private_sig_net_id } }, template: x } }
-      security_groups:
-        - { get_param: vellum_sig_outbound_security_group }
-        - { get_param: vellum_sig_inbound_security_group }
+      handle: {get_resource: wait_handle}
+      count: 1
+      timeout: 1200
+
+  wait_handle:
+    type: OS::Heat::WaitConditionHandle
 
   server:
     type: OS::Nova::Server
@@ -132,7 +104,6 @@ resources:
       key_name: { get_param: key_name }
       networks:
         - port: { get_resource: mgmt_port }
-        - port: { get_resource: sig_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -141,51 +112,22 @@ resources:
             __zone__: { get_param: zone }
             __public_mgmt_ip__: { get_attr: [ mgmt_floating_ip, floating_ip_address ] }
             __private_mgmt_ip__: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-            __private_sig_ip__: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }
-            __private_sig_cidr__: { get_param: private_sig_net_cidr }
-            __private_sig_gateway__: { get_param: private_sig_net_gateway }
             __dns_mgmt_ip__: { get_param: dns_mgmt_ip }
-            __dns_sig_ip__: { get_param: dns_sig_ip }
             __dnssec_key__: { get_param: dnssec_key }
             __etcd_ip__ : { get_param: etcd_ip }
             __index__ : { get_param: index }
+            wc_notify: { get_attr: [wait_handle, curl_cli] }
           template: |
             #!/bin/bash
 
             # Log all output to file.
             exec > >(tee -a /var/log/clearwater-heat-vellum.log) 2>&1
             set -x
-
-            # Set up the signaling network namespace on each boot by creating an init file and
-            # linking to it from runlevel 2 and 3
-            cat >/etc/init.d/signaling_namespace <<EOF
-            #!/bin/bash
-            # Create the signaling namespace and configure its interfaces.
-            set -e
-
-            # Exit if the namespace is already set up.
-            ip netns list | grep -q signaling && exit 0
-
-            # eth1 is the signaling interface (and eth0 is the management interface).
-            # We need to set eth1 up manually - only eth0 is automatically configured via DHCP.
-            ip netns add signaling
-            ip link set eth1 netns signaling
-            ip netns exec signaling ip link set dev lo up
-            ip netns exec signaling ip addr add __private_sig_ip__/$(echo __private_sig_cidr__ | cut -d / -f 2) dev eth1
-            ip netns exec signaling ip link set dev eth1 up
-            ip netns exec signaling ip route add default via __private_sig_gateway__
-            EOF
-
-            chmod a+x /etc/init.d/signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc2.d/S01signaling_namespace
-            ln -s /etc/init.d/signaling_namespace /etc/rc3.d/S01signaling_namespace
-
-            # Also set up the signaling namespace now.
-            /etc/init.d/signaling_namespace
+            sleep 180
+            sysctl -w net.ipv6.conf.lo.disable_ipv6=0
 
             # Configure the APT software source.
-            echo 'deb __repo_url__ binary/' > /etc/apt/sources.list.d/clearwater.list
-            curl -L http://repo.cw-ngv.com/repo_key | apt-key add -
+            echo 'deb http://artifacts.opnfv.org/functest/clearwater/debian ./' > /etc/apt/sources.list.d/clearwater.list
             apt-get update
 
             # Configure /etc/clearwater/local_config.
@@ -193,11 +135,8 @@ resources:
             etcd_ip=__etcd_ip__
             [ -n "$etcd_ip" ] || etcd_ip=__private_mgmt_ip__
             cat > /etc/clearwater/local_config << EOF
-            signaling_namespace=signaling
-            signaling_dns_server=__dns_sig_ip__
-            management_local_ip=__private_mgmt_ip__
-            local_ip=__private_sig_ip__
-            public_ip=__private_sig_ip__
+            local_ip=__private_mgmt_ip__
+            public_ip=__private_mgmt_ip__
             public_hostname=__index__.vellum.__zone__
             etcd_cluster=$etcd_ip
             EOF
@@ -206,7 +145,7 @@ resources:
             mkdir -p /etc/chronos
             cat > /etc/chronos/chronos.conf << EOF
             [http]
-            bind-address = __private_sig_ip__
+            bind-address = __private_mgmt_ip__
             bind-port = 7253
             threads = 50
 
@@ -218,7 +157,7 @@ resources:
             enabled = true
 
             [dns]
-            servers = __dns_sig_ip__
+            servers = __dns_mgmt_ip__
             EOF
 
             # Now install the software.
@@ -239,7 +178,7 @@ resources:
             while ! { nsupdate -y "__zone__:__dnssec_key__" -v << EOF
             server __dns_mgmt_ip__
             update add vellum-__index__.__zone__. 30 $(ip2rr __public_mgmt_ip__)
-            update add vellum.__zone__. 30 $(ip2rr __private_sig_ip__)
+            update add vellum.__zone__. 30 $(ip2rr __public_mgmt_ip__)
             send
             EOF
             } && [ $retries -lt 10 ]
@@ -252,10 +191,19 @@ resources:
             # Use the DNS server.
             echo 'nameserver __dns_mgmt_ip__' > /etc/dnsmasq.resolv.conf
             echo 'RESOLV_CONF=/etc/dnsmasq.resolv.conf' >> /etc/default/dnsmasq
-            mkdir -p /etc/netns/signaling
-            echo 'nameserver __dns_sig_ip__' > /etc/netns/signaling/resolv.conf
             service dnsmasq force-reload
 
+            for ((i=1;i<=10;i++)); do
+                monit summary
+                test -z "$(monit summary 2>&1 |sed '1,2d' |grep -v Running |grep -v Status\ ok )" && break || sleep 60
+            done
+            clearwater-etcdctl cluster-health
+            clearwater-etcdctl member list
+            cw-check_cluster_state
+            cw-check_config_sync
+
+            wc_notify --data-binary '{"status": "SUCCESS"}'
+
 outputs:
   public_mgmt_ip:
     description: IP address in public management network
@@ -263,6 +211,3 @@ outputs:
   private_mgmt_ip:
     description: IP address in private management network
     value: { get_attr: [ mgmt_port, fixed_ips, 0, ip_address ] }
-  private_sig_ip:
-    description: IP address in private signaling network
-    value: { get_attr: [ sig_port, fixed_ips, 0, ip_address ] }