diff --git a/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml b/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml
index c9d9006cb..8a3373f61 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-node-unprovision.yaml
@@ -33,11 +33,10 @@
       when:
         - baremetal_deployment is undefined
     - fail:
-        msg: unprovision_confirm or unprovision_environment is required when prompt is true
+        msg: unprovision_confirm is required when prompt is true
       when:
         - prompt
         - unprovision_confirm is undefined
-        - unprovision_environment is undefined
 
   tasks:
 
@@ -54,25 +53,10 @@
       register: baremetal_existing
 
     - name: Write unprovision confirmation
-      block:
-        - name: Write instances for confirmation
-          copy:
-            dest: "{{ unprovision_confirm }}"
-            content: "{{ baremetal_existing.instances | to_json }}"
-          when: unprovision_confirm is defined
-        - name: Expand roles for provisioned instances
-          tripleo_baremetal_expand_roles:
-            baremetal_deployment: "{{ baremetal_deployment }}"
-            stack_name: "{{ stack_name }}"
-            state: present
-          register: baremetal_instances_existing
-          when: unprovision_environment is defined
-        - name: Write environment for node delete resource mapping
-          copy:
-            dest: "{{ unprovision_environment }}"
-            content: "{{ baremetal_instances_existing.environment | to_json }}"
-          when: unprovision_environment is defined
-      when: prompt|bool
+      copy:
+        dest: "{{ unprovision_confirm }}"
+        content: "{{ baremetal_existing.instances | to_json }}"
+      when: prompt|bool and unprovision_confirm is defined
 
     - name: Unprovision instances
       metalsmith_instances: