diff --git a/roles/undercloud/tasks/main.yml b/roles/undercloud/tasks/main.yml
index 9db1f1c07a..6fe05b3c97 100644
--- a/roles/undercloud/tasks/main.yml
+++ b/roles/undercloud/tasks/main.yml
@@ -41,7 +41,6 @@
   - undercloud.conf
   - templates/node-info.yaml
   - openstack-overcloud-deploy.sh
-  - configure-federation
   tags:
   - config
   - undercloud
@@ -49,7 +48,7 @@
 - name: Copy templates to ~/stack/
   template: src={{item}} dest=/home/stack/{{item}} owner=stack group=stack mode=0644
   with_items:
-  - cinder-dellps-config.yaml
+  - custom-storage.yaml
   - environment-rhel-registration.yaml
   tags:
   - config
@@ -62,12 +61,6 @@
   - undercloud
   - nodes
 
-- name: Copy fed_variables
-  template: src=fed_variables dest=/home/stack/fed_variables owner=stack group=stack mode=0644
-  tags:
-  - config
-  - undercloud
-
 - name: Do an undercloud install if it has yet to be done
   become: yes
   become_user: stack