diff --git a/reboot-home.yml b/reboot-home.yml
index ab65a7b..be7e514 100755
--- a/reboot-home.yml
+++ b/reboot-home.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env ansible-playbook
 # vim:ft=ansible:
 ---
-- hosts: tags_pik8s-node,tags_pistorage,tags_pik8s-master
+- hosts: device_roles_pik8s-node,device_roles_pik8s-storage,device_roles_pik8s-master
   serial: 1
   tasks:
     - name: check for reboot-required
@@ -9,5 +9,5 @@
       register: s
     - name: reboot
       reboot: reboot_timeout=300
-      when: s.stat.exists or reboot_force
+      when: s.stat.exists
       become: yes
diff --git a/reboot-prod.yml b/reboot-prod.yml
index 2133e96..3da228b 100755
--- a/reboot-prod.yml
+++ b/reboot-prod.yml
@@ -9,5 +9,5 @@
       register: s
     - name: reboot
       reboot: reboot_timeout=300
-      when: s.stat.exists or reboot_force
+      when: s.stat.exists
       become: yes