diff --git a/infrastructure-playbooks/purge-iscsi-gateways.yml b/infrastructure-playbooks/purge-iscsi-gateways.yml
index fa86d126e..369901430 100644
--- a/infrastructure-playbooks/purge-iscsi-gateways.yml
+++ b/infrastructure-playbooks/purge-iscsi-gateways.yml
@@ -20,7 +20,9 @@
         igw_purge_type: "{{ purge_config }}"
 
 - name: Removing the gateway configuration
-  hosts: iscsigws
+  hosts:
+    - iscsigws
+    - iscsi-gws # for backward compatibility only!
   become: yes
   vars:
     - igw_purge_type: "{{hostvars['localhost']['igw_purge_type']}}"
diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 92a0e63a4..c9438d713 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -697,6 +697,7 @@
 
   hosts:
     - "{{ iscsi_gw_group_name|default('iscsigws') }}"
+    - iscsi-gws # for backward compatibility only!
 
   serial: 1
   become: True
diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 6eae75683..a76d1e7b4 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -12,6 +12,7 @@
   - rbdmirrors
   - clients
   - iscsigws
+  - iscsi-gws # for backward compatibility only!
   - mgrs
 
   gather_facts: false
@@ -331,7 +332,9 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts: iscsigws
+- hosts:
+    - iscsigws
+    - iscsi-gws # for backward compatibility only!
   gather_facts: false
   become: True
   pre_tasks:
diff --git a/site.yml.sample b/site.yml.sample
index f5782acec..fdba38d93 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -13,6 +13,7 @@
   - clients
   - mgrs
   - iscsigws
+  - iscsi-gws # for backward compatibility only!
 
   gather_facts: false
   any_errors_fatal: true
@@ -358,7 +359,9 @@
             status: "Complete"
             end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
 
-- hosts: iscsigws
+- hosts:
+    - iscsigws
+    - iscsi-gws # for backward compatibility only!
   gather_facts: false
   become: True
   pre_tasks: