diff --git a/tasks/upgrade.yml b/tasks/upgrade.yml
index 23dcbdec79887ff32b7d232904714edf5176e7aa..a177d0761a514afcb6d4e289cbef2060541752a9 100644
--- a/tasks/upgrade.yml
+++ b/tasks/upgrade.yml
@@ -1,7 +1,7 @@
 ---
 - name: initialise variable that controls the reboot of the host
   set_fact:
-    doreboot: False 
+    _freebsd_reboot: False 
 
 - block:
    - name: get hostname of migrationhost
@@ -33,7 +33,7 @@
   
    - name: set variable that controls the reboot of the host
      set_fact:
-       doreboot: "{{ system_upgrade_states[migrationhost].host.state }}"
+       _freebsd_reboot: "{{ system_upgrade_states[migrationhost].host.state }}"
   when: system_upgrade_states is defined
 
 - block:
@@ -55,16 +55,16 @@
 
    - name: set variable that controls the reboot of the host
      set_fact:
-       doreboot: "{{ system_upgrade_states[inventory_hostname].host.state }}"
+       _freebsd_reboot: "{{ system_upgrade_states[inventory_hostname].host.state }}"
 
   when: system_upgrade_states is not defined
   
-- name: restart {{ inventory_hostname }} 
-  command: "shutdown -r -t +10s"
-  async: 0
-  poll: 0
-  ignore_errors: yes
-  when: doreboot == True
-  
-- wait_for_connection:
+- name: debug _freebsd_reboot
+  debug:
+    var: _freebsd_reboot
 
+- include_role:
+    name: system
+    tasks_from: reboot
+  when: _freebsd_reboot == True
+