diff --git a/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2 b/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2
index ee11d9417..d1cf2f806 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2
@@ -11,7 +11,7 @@
 {% for host in groups.get(group, []) %}
 {%- if hostvars[host].kolla_overcloud_inventory_pass_through_enabled | default(true) | bool -%}
 {{ host }}
-{%- endif -%}
+{% endif -%}
 {% endfor %}
 
 {% endfor %}
diff --git a/releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml b/releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml
new file mode 100644
index 000000000..c0ccc524b
--- /dev/null
+++ b/releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix all hostnames in a group being merged into a single line in the kolla
+    overcloud hosts inventory file.
+    `LP#2158773 <https://bugs.launchpad.net/kayobe/+bug/2158773>`__
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2b889a470..2687d1be0 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -71,19 +71,11 @@
     required-projects:
       # Include kayobe to ensure other projects can use this job.
       - name: openstack/ansible-collection-kolla
-        # TODO(wszumski): Remove when kayobe stable/2026.1 exists.
-        override-checkout: stable/2026.1
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
-        # TODO(wszumski): Remove when kayobe stable/2026.1 exists.
-        override-checkout: stable/2026.1
       - name: openstack/kolla-ansible
-        # TODO(wszumski): Remove when kayobe stable/2026.1 exists.
-        override-checkout: stable/2026.1
       - name: openstack/requirements
-        # TODO(wszumski): Remove when kayobe stable/2026.1 exists.
-        override-checkout: stable/2026.1
       - name: openstack/tenks
     irrelevant-files:
       - ^\..+