diff --git a/roles/ceph-infra/tasks/configure_firewall.yml b/roles/ceph-infra/tasks/configure_firewall.yml
index eddcac6bf..1c905d440 100644
--- a/roles/ceph-infra/tasks/configure_firewall.yml
+++ b/roles/ceph-infra/tasks/configure_firewall.yml
@@ -178,8 +178,8 @@
     state: enabled
   notify: restart firewalld
   when:
-    - iscsi_group_name is defined
-    - iscsi_group_name in group_names
+    - iscsi_gw_group_name is defined
+    - iscsi_gw_group_name in group_names
     - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
   tags:
     - firewall