diff --git a/app/sovran_systemsos_web/server.py b/app/sovran_systemsos_web/server.py
index 3a6cbec..19d792b 100644
--- a/app/sovran_systemsos_web/server.py
+++ b/app/sovran_systemsos_web/server.py
@@ -77,8 +77,6 @@ NJALLA_SCRIPT     = "/var/lib/njalla/njalla.sh"
 INTERNAL_IP_FILE = "/var/lib/secrets/internal-ip"
 ZEUS_CONNECT_FILE = "/var/lib/secrets/zeus-connect-url"
 
-REBOOT_UNIT = "sovran-hub-reboot.service"
-
 ONBOARDING_FLAG = "/var/lib/sovran/onboarding-complete"
 AUTOLAUNCH_DISABLE_FLAG = "/var/lib/sovran/hub-autolaunch-disabled"
 
@@ -2054,7 +2052,7 @@ async def api_upgrade_to_server():
     # and ports first via the onboarding wizard. Reboot so onboarding runs.
     try:
         proc = await asyncio.create_subprocess_exec(
-            "/run/current-system/sw/bin/systemctl", "start", "--no-block", REBOOT_UNIT,
+            "/run/current-system/sw/bin/reboot",
             stdout=asyncio.subprocess.DEVNULL,
             stderr=asyncio.subprocess.DEVNULL,
         )
@@ -2887,7 +2885,7 @@ async def api_ping():
 async def api_reboot():
     try:
         proc = await asyncio.create_subprocess_exec(
-            "/run/current-system/sw/bin/systemctl", "start", "--no-block", REBOOT_UNIT,
+            "/run/current-system/sw/bin/reboot",
             stdout=asyncio.subprocess.DEVNULL,
             stderr=asyncio.subprocess.DEVNULL,
         )
diff --git a/modules/core/sovran-hub.nix b/modules/core/sovran-hub.nix
index 9bae98b..c7e70ba 100644
--- a/modules/core/sovran-hub.nix
+++ b/modules/core/sovran-hub.nix
@@ -380,14 +380,6 @@ in
       };
     };
 
-    systemd.services.sovran-hub-reboot = {
-      description = "Sovran_SystemsOS Reboot";
-      serviceConfig = {
-        Type      = "oneshot";
-        ExecStart = "/run/current-system/sw/bin/systemctl reboot";
-      };
-    };
-
     environment.systemPackages = [ sovran-hub-web ];
 
     networking.firewall.allowedTCPPorts = [ 8937 60847 ];