diff --git a/tasks/main.yml b/tasks/main.yml
index d0e64de2..c1f92613 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -44,7 +44,7 @@
     - ironic-config
 
 - include: ironic_conductor_post_install.yml
-  when: inventory_hostname in groups['ironic_conductor']
+  when: "ironic_services['ironic-conductor']['group'] in group_names"
   tags:
     - ironic-config
 
diff --git a/vars/main.yml b/vars/main.yml
index 23aad273..97b1e4c2 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -20,10 +20,10 @@ ironic_packages_list: >
   {%- if ironic_developer_mode | bool %}
   {%-   set package_list = package_list + ironic_developer_mode_distro_packages %}
   {%- endif %}
-  {%- if inventory_hostname in groups['ironic_api'] %}
+  {%- if ironic_services['ironic-api']['group'] in group_names %}
   {%-   set package_list = package_list + ironic_api_distro_packages %}
   {%- endif %}
-  {%- if inventory_hostname in groups['ironic_conductor'] %}
+  {%- if ironic_services['ironic-conductor']['group'] in group_names %}
   {%-   set package_list = package_list + ironic_conductor_distro_packages %}
   {%-   if ironic_standalone | bool %}
   {%-     set package_list = package_list + ironic_conductor_standalone_distro_packages %}