diff --git a/tripleo_ipa/playbooks/cli-cleanup-ipa.yml b/tripleo_ipa/playbooks/cli-cleanup-ipa.yml
index abe28cc..9a39d66 100644
--- a/tripleo_ipa/playbooks/cli-cleanup-ipa.yml
+++ b/tripleo_ipa/playbooks/cli-cleanup-ipa.yml
@@ -57,8 +57,7 @@
 
     - name: create list of hosts to clean up in IPA
       set_fact:
-        hosts_list: "{{ hosts_list + [ hostvars[item]['canonical_hostname'] ] }}"
-      loop: "{{ groups.certmonger_user | default([]) }}"
+        hosts_list: "{{ groups.allovercloud | map('extract', hostvars, 'canonical_hostname') | list }}"
 
     - name: import cleanup tasks from the tripleo-ipa role
       include_role: