diff --git a/scripts/umbrel-os/services/umbrel-startup.service b/scripts/umbrel-os/services/umbrel-startup.service
index b9e8595..d9a0ec9 100644
--- a/scripts/umbrel-os/services/umbrel-startup.service
+++ b/scripts/umbrel-os/services/umbrel-startup.service
@@ -10,6 +10,10 @@ After=network-online.target
 Wants=docker.service
 After=docker.service
 
+# This prevents us hitting restart rate limits and ensures we keep restarting
+# indefinitely.
+StartLimitInterval=0
+
 [Service]
 Type=forking
 TimeoutStartSec=infinity
@@ -22,6 +26,8 @@ StandardOutput=syslog
 StandardError=syslog
 SyslogIdentifier=umbrel startup
 RemainAfterExit=yes
+Restart=always
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target