diff --git a/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2 b/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2
index da8fcd668..26953081f 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2
@@ -36,7 +36,7 @@ ansible_python_interpreter={{ kolla_ansible_target_venv }}/bin/python
 # Mapping from kolla-ansible group {{ kolla_group }} to top level kayobe
 # groups.
 [{{ kolla_group }}:children]
-{% for group in kolla_group_config.groups %}
+{% for group in renamed_groups %}
 {{ group }}
 {% endfor %}
 
diff --git a/releasenotes/notes/fix-kolla-ansible-group-mapping-8fcd6cbb1e744e18.yaml b/releasenotes/notes/fix-kolla-ansible-group-mapping-8fcd6cbb1e744e18.yaml
new file mode 100644
index 000000000..08fa49bc6
--- /dev/null
+++ b/releasenotes/notes/fix-kolla-ansible-group-mapping-8fcd6cbb1e744e18.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes Ansible inventory generation with some custom group mappings using
+    the same group names for Kayobe and Kolla Ansible. See `story 2009927
+    <https://storyboard.openstack.org/#!/story/2009927>`__ for details.