diff --git a/playbooks/groups/copr-hypervisor.yml b/playbooks/groups/copr-hypervisor.yml
index 62b97a8ebe..d1ca47517d 100644
--- a/playbooks/groups/copr-hypervisor.yml
+++ b/playbooks/groups/copr-hypervisor.yml
@@ -12,6 +12,8 @@
     - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
+    - include_role: name=copr/reboot
+      tags: always
     - import_role: name=base
     - import_role: name=hosts
     - import_role: name=rkhunter
diff --git a/roles/copr/hypervisor/tasks/main.yml b/roles/copr/hypervisor/tasks/main.yml
index ee339d6bac..9598b5a561 100644
--- a/roles/copr/hypervisor/tasks/main.yml
+++ b/roles/copr/hypervisor/tasks/main.yml
@@ -1,10 +1,4 @@
 ---
-- name: Unconditionally reboot the machine with all defaults
-  ansible.builtin.reboot:
-  tags:
-    - never
-    - reboot_copr_hypervisor
-
 - name: OpenStack package repository for RHEL8, noarch only
   copy:
     content: |
diff --git a/roles/copr/reboot/tasks/main.yml b/roles/copr/reboot/tasks/main.yml
new file mode 100644
index 0000000000..db149886b8
--- /dev/null
+++ b/roles/copr/reboot/tasks/main.yml
@@ -0,0 +1,6 @@
+---
+- name: Unconditionally reboot the machine with all defaults
+  ansible.builtin.reboot:
+  tags:
+    - never
+    - trigger_reboot