diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 9dfa8e27..b610b6e4 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1378,7 +1378,7 @@ function restart_system {
         1) return;;
         255) return;;
     esac
-    reboot
+    systemctl reboot -i
 }
 
 function change_system_name {
@@ -1423,7 +1423,7 @@ function set_dynamic_IP {
         echo $'Changing to a dynamic IP address.'
         echo ''
         echo $"System is rebooting. You may need to close this terminal and log in from a new one."
-        reboot
+        systemctl reboot -i
     fi
 }
 
@@ -1559,7 +1559,7 @@ Enter a static local IP address for this system.\n\nIt will typically be ${IPv4_
                    --yesno $"\nFor the change to take effect your system will now need to reboot. Do this now?" 8 60
             sel=$?
             case $sel in
-                0) reboot;;
+                0) systemctl reboot -i;;
             esac
         fi
     fi
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 07b49800..5eeca993 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -625,7 +625,7 @@ if [ -f $MESH_INSTALL_SETUP ]; then
             rm /usr/share/images/desktop-base/desktop-background
             ln -s /usr/share/images/desktop-base/${PROJECT_NAME}_mesh_background.png /usr/share/images/desktop-base/desktop-background
         fi
-        reboot
+        systemctl reboot -i
     fi
 fi
 
diff --git a/src/freedombone-utils-final b/src/freedombone-utils-final
index 4de9c9e8..e49c179a 100755
--- a/src/freedombone-utils-final
+++ b/src/freedombone-utils-final
@@ -83,7 +83,7 @@ $(get_ssh_server_key)
         echo $'Turning off logging'
         ${PROJECT_NAME}-logging off
         echo $'Rebooting the system'
-        reboot
+        systemctl reboot -i
     fi
     echo $'Turning off logging'
     ${PROJECT_NAME}-logging off