diff --git a/ansible/roles/iscsi/tasks/config.yml b/ansible/roles/iscsi/tasks/config.yml
index 897653765036cc87ddfef0db1bf32f8a9687f594..4393db15f56d045814e9784d31c20b5b1d3ece3e 100644
--- a/ansible/roles/iscsi/tasks/config.yml
+++ b/ansible/roles/iscsi/tasks/config.yml
@@ -4,7 +4,8 @@
     path: "{{ node_config_directory }}/{{ item }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups['compute']
+  when: inventory_hostname in groups['compute'] or
+        inventory_hostname in groups['storage']
   with_items:
     - "iscsid"
 
@@ -12,7 +13,8 @@
   template:
     src: "{{ item }}.json.j2"
     dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  when: inventory_hostname in groups['compute']
+  when: inventory_hostname in groups['compute'] or
+        inventory_hostname in groups['storage']
   with_items:
     - "iscsid"