diff --git a/roles/cord-helm-charts/files/core_templates/_helpers.tpl b/roles/cord-helm-charts/files/core_templates/_helpers.tpl
index 399c79a..59cd236 100644
--- a/roles/cord-helm-charts/files/core_templates/_helpers.tpl
+++ b/roles/cord-helm-charts/files/core_templates/_helpers.tpl
@@ -1,3 +1,19 @@
+{{- /*
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
+
 {{- define "xos-core.release_labels" }}
 app: {{ printf "%s-%s" .Release.Name .Chart.Name | trunc 63 }}
 version: {{ .Chart.Version }}
diff --git a/roles/cord-helm-charts/files/core_templates/core-configmap.yaml b/roles/cord-helm-charts/files/core_templates/core-configmap.yaml
index 1e79d79..7c07a81 100644
--- a/roles/cord-helm-charts/files/core_templates/core-configmap.yaml
+++ b/roles/cord-helm-charts/files/core_templates/core-configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/roles/cord-helm-charts/files/core_templates/core-deployment.yaml b/roles/cord-helm-charts/files/core_templates/core-deployment.yaml
index 8090347..9f09328 100644
--- a/roles/cord-helm-charts/files/core_templates/core-deployment.yaml
+++ b/roles/cord-helm-charts/files/core_templates/core-deployment.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
diff --git a/roles/cord-helm-charts/files/core_templates/core-service.yaml b/roles/cord-helm-charts/files/core_templates/core-service.yaml
index ab63b07..080589a 100644
--- a/roles/cord-helm-charts/files/core_templates/core-service.yaml
+++ b/roles/cord-helm-charts/files/core_templates/core-service.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/roles/cord-helm-charts/files/core_templates/db-configmap.yaml b/roles/cord-helm-charts/files/core_templates/db-configmap.yaml
index 45183b2..ef0fa9b 100644
--- a/roles/cord-helm-charts/files/core_templates/db-configmap.yaml
+++ b/roles/cord-helm-charts/files/core_templates/db-configmap.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/roles/cord-helm-charts/files/core_templates/db-deployment.yaml b/roles/cord-helm-charts/files/core_templates/db-deployment.yaml
index 326c475..19cdbd6 100644
--- a/roles/cord-helm-charts/files/core_templates/db-deployment.yaml
+++ b/roles/cord-helm-charts/files/core_templates/db-deployment.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
diff --git a/roles/cord-helm-charts/files/core_templates/db-service.yaml b/roles/cord-helm-charts/files/core_templates/db-service.yaml
index 96433b2..d487bfb 100644
--- a/roles/cord-helm-charts/files/core_templates/db-service.yaml
+++ b/roles/cord-helm-charts/files/core_templates/db-service.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/roles/imagebuilder-publish/defaults/main.yml b/roles/imagebuilder-publish/defaults/main.yml
index 551740c..e18c44e 100644
--- a/roles/imagebuilder-publish/defaults/main.yml
+++ b/roles/imagebuilder-publish/defaults/main.yml
@@ -18,3 +18,4 @@
 deploy_docker_registry: ""
 deploy_docker_tag: "candidate"
 
+build_docker_tag: "candidate"
diff --git a/roles/xos-core-build/defaults/main.yml b/roles/xos-core-build/defaults/main.yml
deleted file mode 100644
index d17e723..0000000
--- a/roles/xos-core-build/defaults/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# xos-core-build/defaults/main.yml
-
-build_cord_dir: "{{ playbook_dir ~ '/../..' }}"
-build_docker_tag: "candidate"
-
-profile_library: ""
-
-xos_services: []
-
diff --git a/roles/xos-core-build/tasks/main.yml b/roles/xos-core-build/tasks/main.yml
deleted file mode 100644
index f2bb0b3..0000000
--- a/roles/xos-core-build/tasks/main.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# xos-core-build/tasks/main.yml
-
-- name: Intialize recipe list
-  set_fact:
-    recipes: []
-
-- name: Check to see which recipes exist
-  stat:
-    path: "{{ build_cord_dir | realpath }}/{{ item.path }}/xos/{{ item.name }}-{{ item.operation | default('onboard') }}.yaml"
-  register: service_stats
-  with_items: "{{ xos_services }}"
-
-- name: Generate list of recipes
-  set_fact:
-    recipes: "{{ recipes }} + [ '/opt/cord/{{ item.0.path }}/xos/{{ item.0.name }}-{{ item.0.operation | default('onboard') }}.yaml']"
-  with_together:
-    - "{{ xos_services }}"
-    - "{{ service_stats.results }}"
-  when:
-    - item.1.stat.exists == true
-
-- name: Add in the profile library
-  set_fact:
-    recipes: "{{ recipes }} + [ '/opt/cord/orchestration/profiles/{{ profile_library }}/xos/{{ profile_library }}-onboard.yaml']"
-  when:
-    profile_library != ""
-
-- name: Join the list of recipes
-  set_fact:
-    recipes_string: "{{ recipes | join(' ') }}"
-
-- debug:
-    msg: "{{ recipes }}"
-
-- name: Create the BUILD directory
-  file:
-    path: "{{ build_cord_dir | realpath }}/orchestration/xos/containers/xos/BUILD"
-    state: directory
-    mode: 0755
-
-# Run the corebuilder tool -- we can't do this using a docker ansible command,
-# as we have to wait for the tool to complete before continuing.
-
-- name: Run the corebuilder tool
-  shell: >
-    docker run
-    --rm
-    -v {{ build_cord_dir | realpath }}:/opt/cord
-    -v {{ build_cord_dir ~ "/orchestration/xos/containers/xos/BUILD" | realpath }}:/opt/xos_corebuilder/BUILD
-    xosproject/xos-corebuilder:{{ build_docker_tag }}
-    {{ recipes_string }}
-  when: recipes_string != ""
-  tags:
-   - skip_ansible_lint # running a build task
-
-- name: Build UI image
-  docker_image:
-    name: "xosproject/xos-ui"
-    path: "{{ build_cord_dir | realpath }}/orchestration/xos"
-    tag: "{{ build_docker_tag }}"
-    dockerfile: "containers/xos/Dockerfile.UI"
-    pull: False
-    force: True
diff --git a/roles/xos-core-publish/defaults/main.yml b/roles/xos-core-publish/defaults/main.yml
deleted file mode 100644
index b7412c4..0000000
--- a/roles/xos-core-publish/defaults/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# xos-core-publish/defaults/main.yml
-
-build_docker_tag: "candidate"
-
-deploy_docker_registry: ""
-deploy_docker_tag: "candidate"
diff --git a/roles/xos-core-publish/tasks/main.yml b/roles/xos-core-publish/tasks/main.yml
deleted file mode 100644
index 264cb4b..0000000
--- a/roles/xos-core-publish/tasks/main.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# xos-core-publish/tasks/main.yml
-
-- name: Remove old local UI image
-  docker_image:
-    name: "{{ deploy_docker_registry }}/xosproject/xos-ui:{{ deploy_docker_tag }}"
-    state: absent
-
-- name: Tag and push the UI image
-  docker_image:
-    name: "xosproject/xos-ui:{{ build_docker_tag }}"
-    repository: "{{ deploy_docker_registry }}/xosproject/xos-ui:{{ deploy_docker_tag }}"
-    push: True
-
-