diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 542ac64..d867ef6 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -12,12 +12,6 @@
 head_cord_profile_dir: "/opt/cord_profile"
 head_cord_dir: "/opt/cord"
 
-deploy_docker_registry: "" # was: "localhost:5000/"
-deploy_docker_tag: "candidate"
-
-# name of docker image to use in onboarding synchronizer
-xos_docker_image: "{{ deploy_docker_registry }}xosproject/xos{{ deploy_docker_tag }}"
-
 # For storing OpenStack images
 image_dir: /opt/images
 
@@ -35,11 +29,13 @@
 
 use_vtn: True
 
+# Docker related settings
+deploy_docker_registry: ""
+deploy_docker_tag: "candidate"
+
 xos_docker_networks:
   - "xos"
 
-xos_docker_volumes: []
-
 xos_bootstrap_ui_port: 9001
 xos_ui_port: 9000
 
diff --git a/roles/cord-profile/files/fixtures.yaml b/roles/cord-profile/files/fixtures.yaml
index 00da082..02e0f6f 100644
--- a/roles/cord-profile/files/fixtures.yaml
+++ b/roles/cord-profile/files/fixtures.yaml
@@ -90,45 +90,45 @@
     Customize:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosDashboardManager
-          custom_icon: true
+        url: template:xosDashboardManager
+        custom_icon: true
 
     Diagnostic:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosDiagnostic
-          custom_icon: true
+        url: template:xosDiagnostic
+        custom_icon: true
 
     Truckroll:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosTruckroll
-          custom_icon: true
+        url: template:xosTruckroll
+        custom_icon: true
 
     Monitoring:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosCeilometerDashboard
+        url: template:xosCeilometerDashboard
 
     Subscribers:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosSubscribers
+        url: template:xosSubscribers
 
     Tenant:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosTenant
+        url: template:xosTenant
 
     Developer:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosDeveloper
+        url: template:xosDeveloper
 
     Services Grid:
       type: tosca.nodes.DashboardView
       properties:
-          url: template:xosServiceGrid
+        url: template:xosServiceGrid
 
 # -----------------------------------------------------------------------------
 # Network Templates
@@ -137,20 +137,20 @@
     Private:
       type: tosca.nodes.NetworkTemplate
       properties:
-          visibility: private
-          translation: none
+        visibility: private
+        translation: none
 
     Public shared IPv4:
       type: tosca.nodes.NetworkTemplate
       properties:
-          visibility: private
-          translation: NAT
-          shared_network_name: nat-net
+        visibility: private
+        translation: NAT
+        shared_network_name: nat-net
 
     Public dedicated IPv4:
       type: tosca.nodes.NetworkTemplate
       properties:
-          visibility: public
-          translation: none
-          shared_network_name: ext-net
+        visibility: public
+        translation: none
+        shared_network_name: ext-net
 
diff --git a/roles/cord-profile/templates/deployment.yaml.j2 b/roles/cord-profile/templates/deployment.yaml.j2
index 0987b7c..d1c4626 100644
--- a/roles/cord-profile/templates/deployment.yaml.j2
+++ b/roles/cord-profile/templates/deployment.yaml.j2
@@ -21,9 +21,9 @@
       type: tosca.nodes.Deployment
       requirements:
 {% for flavor in deployment_flavors %}
-          - {{ flavor }}:
-              node: {{ flavor }}
-              relationship: tosca.relationships.SupportsFlavor
+        - {{ flavor }}:
+            node: {{ flavor }}
+            relationship: tosca.relationships.SupportsFlavor
 
 {% endfor %}
 
@@ -31,9 +31,9 @@
     {{ site_name }}:
       type: tosca.nodes.Site
       properties:
-          display_name: {{ site_humanname }}
-          site_url: http://{{ site_name }}.opencloud.us/
-          hosts_nodes: true
+        display_name: {{ site_humanname }}
+        site_url: http://{{ site_name }}.opencloud.us/
+        hosts_nodes: true
       requirements:
         - deployment:
             node: {{ deployment_type }}
@@ -43,12 +43,12 @@
     Tenant:
       type: tosca.nodes.DashboardView
       properties:
-          no-create: true
-          no-delete: true
+        no-create: true
+        no-delete: true
       requirements:
-          - deployment:
-              node: {{ deployment_type }}
-              relationship: tosca.relationships.SupportsDeployment
+        - deployment:
+            node: {{ deployment_type }}
+            relationship: tosca.relationships.SupportsDeployment
 
 # XOS Users
 # Default admin user account
@@ -64,8 +64,8 @@
             node: {{ site_name }}
             relationship: tosca.relationships.MemberOfSite
         - tenant_dashboard:
-              node: Tenant
-              relationship: tosca.relationships.UsesDashboard
+            node: Tenant
+            relationship: tosca.relationships.UsesDashboard
 
 # All other users
 {% for user in xos_users %}
@@ -81,8 +81,8 @@
             node: {{ site_name }}
             relationship: tosca.relationships.MemberOfSite
         - tenant_dashboard:
-              node: Tenant
-              relationship: tosca.relationships.UsesDashboard
+            node: Tenant
+            relationship: tosca.relationships.UsesDashboard
 
 {% endfor %}
 
diff --git a/roles/cord-profile/templates/xos_common_config.j2 b/roles/cord-profile/templates/xos_common_config.j2
index ba67acd..af7b2a0 100644
--- a/roles/cord-profile/templates/xos_common_config.j2
+++ b/roles/cord-profile/templates/xos_common_config.j2
@@ -1,5 +1,5 @@
 ; xos_common_config
-; generated by platform-install/roles/cord-profile
+; generated by cord-profile/templates/xos_common_config.j2
 
 [plc]
 name=plc