diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index a82a911..9e689eb 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -64,6 +64,7 @@
 xos_gui_service_graph_constraints: []
 
 xos_tosca_config_templates: []
+xos_new_tosca_config_templates: [] # Deprecated
 
 xos_other_templates: []
 
diff --git a/roles/cord-profile/tasks/main.yml b/roles/cord-profile/tasks/main.yml
index c916886..3b478a9 100644
--- a/roles/cord-profile/tasks/main.yml
+++ b/roles/cord-profile/tasks/main.yml
@@ -130,17 +130,15 @@
   set_fact:
     cord_profile_src_dir: "../../orchestration/profiles/{{ cord_use_case }}"
 
+- debug:
+    msg: "[WARNING] xos_new_tosca_config_templates is deprecated"
+  when: xos_new_tosca_config_templates
+
 - name: Create profile specific templated TOSCA config files
   template:
     src: "{{ cord_profile_src_dir }}/templates/{{ item }}.j2"
     dest: "{{ config_cord_profile_dir }}/{{ item }}"
-  with_items: "{{ xos_tosca_config_templates }}"
-
-- name: Create profile specific templated TOSCA config files (new Engine)
-  template:
-    src: "{{ cord_profile_src_dir }}/templates/{{ item }}.j2"
-    dest: "{{ config_cord_profile_dir }}/{{ item }}"
-  with_items: "{{ xos_new_tosca_config_templates }}"
+  with_items: "{{ xos_tosca_config_templates + xos_new_tosca_config_templates }}"
 
 - name: Create profile specific templated non-TOSCA files
   template:
diff --git a/roles/xos-config/defaults/main.yml b/roles/xos-config/defaults/main.yml
index afe9481..55a0062 100644
--- a/roles/xos-config/defaults/main.yml
+++ b/roles/xos-config/defaults/main.yml
@@ -25,7 +25,6 @@
 head_xos_admin_pass: "{{ lookup('file', head_credentials_dir ~ '/' ~ xos_admin_user) }}"
 
 xos_tosca_config_templates: []
-
-xos_new_tosca_config_templates: []
+xos_new_tosca_config_templates: [] # Deprecated
 
 use_openstack: True
diff --git a/roles/xos-config/tasks/main.yml b/roles/xos-config/tasks/main.yml
index daa9d52..8c8ee38 100644
--- a/roles/xos-config/tasks/main.yml
+++ b/roles/xos-config/tasks/main.yml
@@ -61,4 +61,4 @@
   until: result | success
   retries: 50
   delay: 5
-  with_items: "{{ xos_new_tosca_config_templates }}"
+  with_items: "{{ xos_tosca_config_templates + xos_new_tosca_config_templates }}"