diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index 28de081..e8b2696 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -71,6 +71,8 @@
       - "DNS:xos-core.{{ site_suffix }}"
 
 # Network/DNS settings
+headnode: head1
+
 dns_search:
   - "{{ site_suffix }}"
 
@@ -89,23 +91,31 @@
       - { name: ns1 }
     nodelists:
       - head_lxd_list
+      - physical_node_list
     aliases:
-      - { 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: "apt-cache", dest: "{{ headnode }}" }
+      - { name: "cordloghost", dest: "{{ headnode }}" }
+      - { name: "docker", dest: "{{ headnode }}" }
+      - { name: "ns", dest: "{{ headnode }}" }
+      - { name: "ns1", dest: "{{ headnode }}" }
+      - { name: "onos-cord", dest: "{{ headnode }}" }
+      - { name: "xos", dest: "{{ headnode }}" }
+      - { name: "xos-chameleon", dest: "{{ headnode }}" }
+      - { name: "xos-rest-gw", dest: "{{ headnode }}" }
+      - { name: "xos-gui", dest: "{{ headnode }}" }
 
 unbound_listen_all: True
 
 unbound_interfaces:
   - "{{ mgmt_ipv4_first_octets }}.1/24"
 
+
+physical_node_list:
+  - name: head1
+    ipv4_last_octet: 1
+    aliases:
+      - head
+
 # VTN network configuration
 management_network_cidr: 172.27.0.0/24
 management_network_ip: 172.27.0.1/24
diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
index e934164..6624df2 100644
--- a/profile_manifests/mcord.yml
+++ b/profile_manifests/mcord.yml
@@ -99,6 +99,8 @@
       - "DNS:xos-core.{{ site_suffix }}"
 
 # Network/DNS settings
+headnode: head1
+
 dns_search:
   - "{{ site_suffix }}"
 
@@ -117,23 +119,30 @@
       - { name: ns1 }
     nodelists:
       - head_lxd_list
+      - physical_node_list
     aliases:
-      - { 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: "apt-cache", dest: "{{ headnode }}" }
+      - { name: "cordloghost", dest: "{{ headnode }}" }
+      - { name: "docker", dest: "{{ headnode }}" }
+      - { name: "ns", dest: "{{ headnode }}" }
+      - { name: "ns1", dest: "{{ headnode }}" }
+      - { name: "onos-cord", dest: "{{ headnode }}" }
+      - { name: "xos", dest: "{{ headnode }}" }
+      - { name: "xos-chameleon", dest: "{{ headnode }}" }
+      - { name: "xos-rest-gw", dest: "{{ headnode }}" }
+      - { name: "xos-gui", dest: "{{ headnode }}" }
 
 unbound_listen_all: True
 
 unbound_interfaces:
   - "{{ mgmt_ipv4_first_octets }}.1/24"
 
+physical_node_list:
+  - name: head1
+    ipv4_last_octet: 1
+    aliases:
+      - head
+
 # VTN network configuration
 management_network_cidr: 172.27.0.0/24
 management_network_ip: 172.27.0.1/24
diff --git a/profile_manifests/opencloud.yml b/profile_manifests/opencloud.yml
index 3fef027..1ab7cef 100644
--- a/profile_manifests/opencloud.yml
+++ b/profile_manifests/opencloud.yml
@@ -9,6 +9,8 @@
 deployment_type: campus
 
 # Feature toggles
+use_maas: False
+use_apt_cache: True
 
 # XOS config
 xos_tosca_config_templates:
@@ -50,6 +52,8 @@
       - "DNS:xos-core.{{ site_suffix }}"
 
 # Network/DNS settings
+headnode: head1
+
 dns_search:
   - "{{ site_suffix }}"
 
@@ -70,16 +74,16 @@
       - head_lxd_list
       - physical_node_list
     aliases:
-      - { 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: "apt-cache", dest: "{{ headnode }}" }
+      - { name: "cordloghost", dest: "{{ headnode }}" }
+      - { name: "docker", dest: "{{ headnode }}" }
+      - { name: "ns", dest: "{{ headnode }}" }
+      - { name: "ns1", dest: "{{ headnode }}" }
+      - { name: "onos-cord", dest: "{{ headnode }}" }
+      - { name: "xos", dest: "{{ headnode }}" }
+      - { name: "xos-chameleon", dest: "{{ headnode }}" }
+      - { name: "xos-rest-gw", dest: "{{ headnode }}" }
+      - { name: "xos-gui", dest: "{{ headnode }}" }
 
 unbound_listen_all: True
 
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index 55815f3..edc60e0 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -86,6 +86,8 @@
       - "DNS:xos-core.{{ site_suffix }}"
 
 # Network/DNS settings
+headnode: prod
+
 dns_search:
   - "{{ site_suffix }}"
 
@@ -104,23 +106,31 @@
       - { name: ns1 }
     nodelists:
       - head_lxd_list
+      - physical_node_list
     aliases:
-      - { 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: "apt-cache", dest: "{{ headnode }}" }
+      - { name: "cordloghost", dest: "{{ headnode }}" }
+      - { name: "docker", dest: "{{ headnode }}" }
+      - { name: "ns", dest: "{{ headnode }}" }
+      - { name: "ns1", dest: "{{ headnode }}" }
+      - { name: "onos-cord", dest: "{{ headnode }}" }
+      - { name: "xos", dest: "{{ headnode }}" }
+      - { name: "xos-chameleon", dest: "{{ headnode }}" }
+      - { name: "xos-rest-gw", dest: "{{ headnode }}" }
+      - { name: "xos-gui", dest: "{{ headnode }}" }
 
 unbound_listen_all: True
 
 unbound_interfaces:
   - "{{ mgmt_ipv4_first_octets }}.1/24"
 
+physical_node_list:
+  - name: prod
+    ipv4_last_octet: 1
+    aliases:
+      - head1
+      - head
+
 # VTN network configuration
 management_network_cidr: 172.27.0.0/24
 management_network_ip: 172.27.0.1/24