diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index 22713e2..c54038d 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -1,25 +1,20 @@
 ---
-# vars/cord-pod.yaml
-# Configures an R-CORD pod
+# profile_manifests/rcord.yml
+# R-CORD Profile Manifest
 
-# site configuration
+# Site configuration
 site_name: mysite
 site_humanname: MySite
+#site_suffix: "{{ site_name }}.cord.lab" - broken, see CORD-1520
+site_suffix: "cord.lab"
 deployment_type: MyDeployment
 
-credentials_dir: "{{ playbook_dir }}/credentials"
-xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
-xos_admin_first: XOS
-xos_admin_last: Admin
-
-xos_users: []
-
-use_vtn: True
+# Feature toggles
 use_fabric: True
+on_maas: True
 
+# XOS config
 xos_tosca_config_templates:
-  - openstack.yaml
   - vtn-service.yaml
   - fabric-service.yaml
   - management-net.yaml
@@ -77,19 +72,6 @@
 
 profile_library: "rcord"
 
-# VM networks/bridges on head
-virt_nets:
-  - name: mgmtbr
-    ipv4_prefix: 192.168.122
-    head_vms: true
-
-# site domain suffix
-site_suffix: cord.lab
-
-# resolv.conf settings
-dns_search:
-  - "{{ site_suffix }}"
-
 # SSL server certificate generation
 server_certs:
   - cn: "keystone.{{ site_suffix }}"
@@ -102,57 +84,48 @@
     altnames:
       - "DNS:xos-core.{{ site_suffix }}"
 
-# NSD/Unbound settings
+# Network/DNS settings
+dns_search:
+  - "{{ site_suffix }}"
+
+mgmt_ipv4_first_octets: "192.168.200"
+
+dns_servers:
+  - "{{ mgmt_ipv4_first_octets }}.1"
+
+# DNS settings for NSD/Unbound
 nsd_zones:
   - name: "{{ site_suffix }}"
-    ipv4_first_octets: 192.168.122
+    ipv4_first_octets: "{{ mgmt_ipv4_first_octets }}"
     name_reverse_unbound: "168.192.in-addr.arpa"
     soa: ns1
     ns:
       - { name: ns1 }
-    nodelist: head_vm_list
+    nodelists:
+      - head_lxd_list
     aliases:
-      - { name: "ns1" , dest: "head" }
-      - { name: "ns" , dest: "head" }
-      - { name: "apt-cache" , dest: "head" }
+      - { name: "apt-cache", dest: "head1" }
+      - { name: "cordloghost", dest: "head1" }
+      - { name: "docker", dest: "head1" }
+      - { name: "ns", dest: "head1" }
+      - { name: "ns1", dest: "head1" }
+      - { name: "onos-cord", dest: "head1" }
+      - { name: "xos", dest: "head1" }
+      - { name: "xos-chameleon", dest: "head1" }
+      - { name: "xos-rest-gw", dest: "head1" }
+      - { name: "xos-spa-gui", dest: "head1" }
 
-name_on_public_interface: head
+unbound_listen_all: True
+
+unbound_interfaces:
+  - "{{ mgmt_ipv4_first_octets }}.1/24"
 
 # VTN network configuration
 management_network_cidr: 172.27.0.0/24
 management_network_ip: 172.27.0.1/24
 data_plane_ip: 10.168.0.253/24
 
-# CORD ONOS app version
-cord_app_version: 1.2-SNAPSHOT
-
-# If true, unbound listens on the head node's `ansible_default_ipv4` interface
-unbound_listen_on_default: True
-
-# turn this on, or override it when running the playbook with --extra-vars="on_cloudlab=True"
-on_cloudlab: False
-
-# turn this off, or override when running playbook with --extra-vars="on_maas=False"
-on_maas: True
-
-run_dist_upgrade: False
-
-maas_node_key: /etc/maas/ansible/id_rsa
-
-openstack_version: kilo
-
-juju_config_name: cord
-
-juju_config_path: /usr/local/src/juju_config.yml
-
-keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
-
-deployment_flavors:
-  - m1.small
-  - m1.medium
-  - m1.large
-  - m1.xlarge
-
+# Juju config
 charm_versions:
   ceilometer-agent: "cs:trusty/ceilometer-agent-13"
   ceilometer: "cs:trusty/ceilometer-17"
@@ -169,7 +142,6 @@
   percona-cluster: "cs:trusty/percona-cluster-31"
   rabbitmq-server: "cs:trusty/rabbitmq-server-42"
 
-head_vm_list: []
 
 head_lxd_list:
   - name: "juju-1"
@@ -254,6 +226,7 @@
       - "mongodb"
     ipv4_last_octet: 110
 
+
 lxd_service_list:
   - ceilometer
   - glance
@@ -266,6 +239,7 @@
   - percona-cluster
   - rabbitmq-server
 
+
 standalone_service_list:
   - ntp
   - nrpe