diff --git a/tasks/cinder_backends.yml b/tasks/cinder_backends.yml
index 2551b9db..75ead578 100644
--- a/tasks/cinder_backends.yml
+++ b/tasks/cinder_backends.yml
@@ -26,7 +26,7 @@
 - name: Create singular cinder_backends variable for all hosts
   set_fact:
     _cinder_backends: "{{ (_cinder_backends | default(cinder_backends | default({}))) | combine(hostvars[item]['cinder_backends'] | default({})) }}"
-  with_items: "{{ groups['cinder_volume'] }}"
+  with_items: "{{ groups[cinder_services['cinder-volume']['group']] }}"
 
 - name: Add in cinder devices types
   shell: |
diff --git a/tasks/main.yml b/tasks/main.yml
index 846ebbb2..64010fda 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -94,9 +94,9 @@
 - include: cinder_backends.yml
   static: no
   when:
-    - "groups['cinder_volume'] | length > 0"
-    - "cinder_services['cinder-volume']['group'] in group_names"
-    - "inventory_hostname == ((groups['cinder_volume'] | intersect(ansible_play_hosts)) | list)[0]"
+    - "groups[cinder_services['cinder-volume']['group']] | length > 0"
+    - "cinder_services['cinder-api']['group'] in group_names"
+    - "inventory_hostname == ((groups[cinder_services['cinder-api']['group']] | intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - cinder-config