diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index ebeb70e..be7b9a1 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -26,12 +26,6 @@
 xos_other_templates:
  - fabric-network-cfg.json
 
-cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
-
-xos_docker_volumes:
-  - host: "{{ cord_profile_dir }}/images"
-    container: /opt/xos/images
-
 # GUI Config [new GUI]
 gui_project_name: "E-CORD"
 gui_background: "cord-bg.jpg" # TODO find ecord image
@@ -133,12 +127,6 @@
 
 juju_config_path: /usr/local/src/juju_config.yml
 
-# Pull ONOS from local Docker registry rather than Docker Hub
-onos_docker_image: "docker-registry:5000/onosproject/onos:candidate"
-
-# Pull XOS from local Docker registry
-xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
-
 keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
 
 deployment_flavors:
diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index 09d1750..75af41b 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -29,12 +29,6 @@
 xos_other_templates:
   - fabric-network-cfg.json
 
-cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
-
-xos_docker_volumes:
-  - host: "{{ cord_profile_dir }}/images"
-    container: /opt/xos/images
-
 # GUI Config [new GUI]
 gui_project_name: "E-CORD"
 gui_background: "cord-bg.jpg" # TODO find ecord image
@@ -147,12 +141,6 @@
 
 juju_config_path: /usr/local/src/juju_config.yml
 
-# Pull ONOS from local Docker registry rather than Docker Hub
-onos_docker_image: "docker-registry:5000/onosproject/onos:candidate"
-
-# Pull XOS from local Docker registry
-xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
-
 keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
 
 deployment_flavors:
diff --git a/profile_manifests/frontend.yml b/profile_manifests/frontend.yml
index f6b3ff6..eb8d7a9 100644
--- a/profile_manifests/frontend.yml
+++ b/profile_manifests/frontend.yml
@@ -39,5 +39,3 @@
   - name: sample
     path: orchestration/xos-sample-gui-extension
 
-# Frontend's XOS does not use docker registry
-xos_docker_image: "xosproject/xos:candidate"
diff --git a/profile_manifests/mcord.yml b/profile_manifests/mcord.yml
index bb0c315..f300928 100644
--- a/profile_manifests/mcord.yml
+++ b/profile_manifests/mcord.yml
@@ -29,12 +29,6 @@
 xos_other_templates:
   - fabric-network-cfg.json
 
-cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
-
-xos_docker_volumes:
-  - host: "{{ cord_profile_dir }}/images"
-    container: /opt/xos/images
-
 # GUI branding [OLD GUI to be removed]
 gui_branding_name: "MCORD"
 gui_branding_icon: "/static/mcord-logo.png"
@@ -179,12 +173,6 @@
 
 juju_config_path: /usr/local/src/juju_config.yml
 
-# Pull ONOS from local Docker registry rather than Docker Hub
-onos_docker_image: "docker-registry:5000/onosproject/onos:candidate"
-
-# Pull XOS from local Docker registry
-xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
-
 keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
 
 deployment_flavors:
diff --git a/profile_manifests/mock-rcord.yml b/profile_manifests/mock-rcord.yml
index 93ebad0..cc8bacb 100644
--- a/profile_manifests/mock-rcord.yml
+++ b/profile_manifests/mock-rcord.yml
@@ -5,12 +5,13 @@
 site_name: mock-rcord
 deployment_type: "Mock R-CORD Pod"
 
-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
 
+credentials_dir: "{{ playbook_dir }}/credentials"
+
 # head == config for mocks
 head_cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
 head_cord_dir: "{{ ansible_user_dir + '/cord' }}"
diff --git a/profile_manifests/opencloud.yml b/profile_manifests/opencloud.yml
index 296d540..ab9eea9 100644
--- a/profile_manifests/opencloud.yml
+++ b/profile_manifests/opencloud.yml
@@ -2,24 +2,6 @@
 # profile_manifests/opencloud.yml
 # Generic OpenCloud Site
 
-# redefined here for running XOS start/config on localhost
-cord_profile: opencloud
-
-# These are source paths, used only on the config host, and should be redefined
-# on a per-pod basis when installing multiple pods
-config_cord_dir: "{{ ansible_user_dir + '/cord' }}"
-config_cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
-
-# Locations on head node (same on all pods)
-head_cord_dir: "/opt/cord"
-head_cord_profile_dir: "/opt/cord_profile"
-head_onos_cord_dir: "/opt/onos-cord"
-
-# Credentials and PKI
-credentials_dir: "{{ playbook_dir }}/credentials"
-pki_dir: "{{ playbook_dir }}/pki"
-ssh_pki_dir: "{{ playbook_dir }}/ssh_pki"
-
 # site configuration
 site_name: generic_opencloud
 site_humanname: "Generic OpenCloud"
@@ -44,10 +26,6 @@
 
 build_xos_base_image: True
 
-xos_docker_volumes:
-  - host: "/opt/cord_profile/images"
-    container: /opt/xos/images
-
 # GUI Branding
 # Not neeeded, default is OpenCloud
 
@@ -86,32 +64,6 @@
     subj: "{{ ssl_cert_subj_prefix }}/CN=xos-core.{{ site_suffix }}"
     altnames:
       - "DNS:xos-core.{{ site_suffix }}"
-  - cn: "docker.{{ site_suffix }}"
-    subj: "{{ ssl_cert_subj_prefix }}/CN=docker.{{ site_suffix }}"
-    altnames:
-      - "DNS:docker.{{ site_suffix }}"
-      - "DNS:head.{{ site_suffix }}"
-      - "IP:127.0.0.1"
-      - "IP:{{ mgmt_ipv4_first_octets }}.1"
-      - "IP:{{ hostvars[headnode_name].ansible_default_ipv4.address }}"
-  - cn: "registry.{{ site_suffix }}"
-    subj: "{{ ssl_cert_subj_prefix }}/CN=registry.{{ site_suffix }}"
-    altnames:
-      - "DNS:registry.{{ site_suffix }}"
-      - "DNS:head.{{ site_suffix }}"
-      - "IP:127.0.0.1"
-      - "IP:{{ mgmt_ipv4_first_octets }}.1"
-      - "IP:{{ hostvars[headnode_name].ansible_default_ipv4.address }}"
-
-client_certs:
-  - cn: "dockerclient"
-    subj: "{{ ssl_cert_subj_prefix }}/CN=dockerclient"
-    altnames:
-      - "email:dockerclient@{{ site_suffix }}"
-  - cn: "dockerbuildhost"
-    subj: "{{ ssl_cert_subj_prefix }}/CN=dockerbuildhost"
-    altnames:
-      - "email:dockerbuildhost@{{ site_suffix }}"
 
 # docker registry users
 docker_registry_users:
@@ -186,8 +138,11 @@
 management_network_ip: 172.27.0.1/24
 data_plane_ip: 10.168.0.253/24
 
+# External interface name on compute nodes
+compute_external_interface: eth0
+
 # ONOS version
-onos_docker_image: "opencord/onos:1.8.2"
+onos_docker_image: "onosproject/onos:1.8.7"
 
 on_maas: False
 on_cloudlab: False
diff --git a/profile_manifests/rcord.yml b/profile_manifests/rcord.yml
index 4f1bb7c..22713e2 100644
--- a/profile_manifests/rcord.yml
+++ b/profile_manifests/rcord.yml
@@ -16,6 +16,7 @@
 xos_users: []
 
 use_vtn: True
+use_fabric: True
 
 xos_tosca_config_templates:
   - openstack.yaml
@@ -30,12 +31,6 @@
 xos_other_templates:
   - fabric-network-cfg.json
 
-cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
-
-xos_docker_volumes:
-  - host: "{{ cord_profile_dir }}/images"
-    container: /opt/xos/images
-
 # GUI branding [OLD GUI to be removed]
 gui_branding_name: "CORD"
 gui_branding_icon: "/static/cord-logo.png"
@@ -150,12 +145,6 @@
 
 juju_config_path: /usr/local/src/juju_config.yml
 
-# Pull ONOS from local Docker registry rather than Docker Hub
-onos_docker_image: "docker-registry:5000/onosproject/onos:candidate"
-
-# Pull XOS from local Docker registry
-xos_docker_image: "docker-registry:5000/xosproject/xos:candidate"
-
 keystone_admin_password: "{{ lookup('password', 'credentials/cord_keystone_admin chars=ascii_letters,digits') }}"
 
 deployment_flavors:
@@ -165,12 +154,11 @@
   - m1.xlarge
 
 charm_versions:
-  ceilometer: "cs:trusty/ceilometer-17"
   ceilometer-agent: "cs:trusty/ceilometer-agent-13"
+  ceilometer: "cs:trusty/ceilometer-17"
   glance: "cs:trusty/glance-28"
   keystone: "cs:trusty/keystone-33"
   mongodb: "cs:trusty/mongodb-33"
-  percona-cluster: "cs:trusty/percona-cluster-31"
   nagios: "cs:trusty/nagios-10"
   neutron-api: "cs:~cordteam/trusty/neutron-api-5"
   nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
@@ -178,6 +166,7 @@
   nrpe: "cs:trusty/nrpe-4"
   ntp: "cs:trusty/ntp-14"
   openstack-dashboard: "cs:trusty/openstack-dashboard-19"
+  percona-cluster: "cs:trusty/percona-cluster-31"
   rabbitmq-server: "cs:trusty/rabbitmq-server-42"
 
 head_vm_list: []