diff --git a/etc/kayobe/ansible/fix-hostname.yml b/etc/kayobe/ansible/fix-hostname.yml
index dc3c92e32..8738412aa 100644
--- a/etc/kayobe/ansible/fix-hostname.yml
+++ b/etc/kayobe/ansible/fix-hostname.yml
@@ -21,3 +21,9 @@
         cmd: hostnamectl set-hostname "{{ inventory_hostname }}"
       when: current_hostname.stdout != inventory_hostname
       become: true
+
+- name: Reboot hosts
+  import_playbook: "{{ playbook_dir | realpath }}/reboot.yml"
+  vars:
+    reboot_hosts: fix-hostname
+  when: current_hostname.stdout != inventory_hostname
diff --git a/etc/kayobe/ansible/reboot.yml b/etc/kayobe/ansible/reboot.yml
index 92603ade2..545c509df 100644
--- a/etc/kayobe/ansible/reboot.yml
+++ b/etc/kayobe/ansible/reboot.yml
@@ -1,6 +1,6 @@
 ---
 - name: Reboot the host
-  hosts: seed-hypervisor:seed:overcloud:infra-vms
+  hosts: "{{ reboot_hosts | default('seed-hypervisor:seed:overcloud:infra-vms') }}"
   serial: "{{ lookup('env', 'ANSIBLE_SERIAL') | default(1, true) }}"
   gather_facts: false
   vars:
diff --git a/etc/kayobe/environments/ci-multinode/hooks/overcloud-host-configure/pre.d/10-fix-hostname.yml b/etc/kayobe/environments/ci-multinode/hooks/overcloud-host-configure/pre.d/10-fix-hostname.yml
new file mode 120000
index 000000000..829fbfd77
--- /dev/null
+++ b/etc/kayobe/environments/ci-multinode/hooks/overcloud-host-configure/pre.d/10-fix-hostname.yml
@@ -0,0 +1 @@
+../../../../../ansible/fix-hostname.yml
\ No newline at end of file
diff --git a/etc/kayobe/environments/ci-multinode/inventory/groups b/etc/kayobe/environments/ci-multinode/inventory/groups
index 08018ca3a..8bc65f541 100644
--- a/etc/kayobe/environments/ci-multinode/inventory/groups
+++ b/etc/kayobe/environments/ci-multinode/inventory/groups
@@ -5,4 +5,4 @@
 controllers
 
 [fix-hostname:children]
-storage
+overcloud
diff --git a/etc/kayobe/environments/ci-multinode/reboot.yml b/etc/kayobe/environments/ci-multinode/reboot.yml
new file mode 100644
index 000000000..26ece04b1
--- /dev/null
+++ b/etc/kayobe/environments/ci-multinode/reboot.yml
@@ -0,0 +1,3 @@
+---
+# Ensure that the reboot playbook is always executed using the boostrap user
+reboot_with_bootstrap_user: true