diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index 3216ea0e4..5c2dc27af 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -503,38 +503,6 @@
       - /var/lib/ceph/tmp
 
 
-- name: purge iscsi gateway(s)
-
-  vars:
-    igw_purge_type: all
-
-  hosts:
-    - "{{ iscsi_gw_group_name|default('iscsi-gws') }}"
-
-  gather_facts: false # already gathered previously
-
-  become: true
-
-  tasks:
-
-  - name: igw_purge | purging the gateway configuration
-    igw_purge:
-      mode: "gateway"
-
-  - name: igw_purge | deleting configured rbd devices
-    igw_purge:
-      mode: "disks"
-    when:
-      - igw_purge_type == 'all'
-
-  - name: restart rbd-target-gw daemons
-    service:
-      name: rbd-target-gw
-      state: restarted
-    when:
-      - ansible_service_mgr == 'systemd'
-
-
 - name: final cleanup - check any running ceph, purge ceph packages, purge config and remove data
 
   vars:
diff --git a/infrastructure-playbooks/purge-iscsi-gateways.yml b/infrastructure-playbooks/purge-iscsi-gateways.yml
new file mode 100644
index 000000000..157dce414
--- /dev/null
+++ b/infrastructure-playbooks/purge-iscsi-gateways.yml
@@ -0,0 +1,37 @@
+---
+
+- name: Confirm removal of the iSCSI gateway configuration
+  hosts: localhost
+
+  vars_prompt:
+    - name: purge_config
+      prompt: Which configuration elements should be purged? (all, lio or abort)
+      default: 'abort'
+      private: no
+
+  tasks:
+    - name: Exit playbook if user aborted the purge
+      fail:
+        msg: >
+          "You have aborted the purge of the iSCSI gateway configuration"
+      when: purge_config == 'abort'
+
+    - set_fact:
+        igw_purge_type: "{{ purge_config }}"
+
+- name: Removing the gateway configuration
+  hosts: ceph-iscsi-gw
+  vars:
+    - igw_purge_type: "{{hostvars['localhost']['igw_purge_type']}}"
+
+  tasks:
+    - name: igw_purge | purging the gateway configuration
+      igw_purge: mode="gateway"
+
+    - name: igw_purge | deleting configured rbd devices
+      igw_purge: mode="disks"
+      when: igw_purge_type == 'all'
+
+    - name: restart rbd-target-gw daemons
+      service: name=rbd-target-gw state=restarted
+