diff --git a/roles/undercloud/tasks/main.yml b/roles/undercloud/tasks/main.yml
index 3dc5ca1b73..26550b841a 100644
--- a/roles/undercloud/tasks/main.yml
+++ b/roles/undercloud/tasks/main.yml
@@ -40,11 +40,11 @@
   - config
   - undercloud
 
-- name: Copy files to ~/stack/templates/
-  copy: src={{item}} dest=/home/stack/templates/{{item}} owner=stack group=stack mode=0644
+- name: Copy templates to ~/stack/
+  template: src={{item}} dest=/home/stack/{{item}} owner=stack group=stack mode=0644
   with_items:
-  - cinder-dellps-config.yaml
-  - environment-rhel-registration.yaml
+  - templates/cinder-dellps-config.yaml
+  - templates/environment-rhel-registration.yaml
   tags:
   - config
   - undercloud
diff --git a/roles/undercloud/templates/cinder-dellps-config.yaml b/roles/undercloud/templates/templates/cinder-dellps-config.yaml
similarity index 100%
rename from roles/undercloud/templates/cinder-dellps-config.yaml
rename to roles/undercloud/templates/templates/cinder-dellps-config.yaml
diff --git a/roles/undercloud/templates/environment-rhel-registration.yaml b/roles/undercloud/templates/templates/environment-rhel-registration.yaml
similarity index 100%
rename from roles/undercloud/templates/environment-rhel-registration.yaml
rename to roles/undercloud/templates/templates/environment-rhel-registration.yaml