diff --git a/package/debian/rules b/package/debian/rules
index cd94da7e5b..612fe1b1a9 100644
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -10,7 +10,7 @@ override_dh_auto_configure override_dh_auto_build override_dh_auto_test:
 
 override_dh_installsystemd:
 	dh_installsystemd --no-stop-on-upgrade xrpld.service
-	dh_installsystemd --name=update-xrpld --no-start update-xrpld.service update-xrpld.timer
+	dh_installsystemd --name=update-xrpld --no-enable --no-start update-xrpld.service update-xrpld.timer
 
 execute_before_dh_installtmpfiles:
 	dh_installsysusers
diff --git a/package/shared/update-xrpld.timer b/package/shared/update-xrpld.timer
index 21dabf1400..9fba09d30a 100644
--- a/package/shared/update-xrpld.timer
+++ b/package/shared/update-xrpld.timer
@@ -3,7 +3,7 @@ Description=Daily xrpld update check
 
 [Timer]
 OnCalendar=*-*-* 00:00:00
-RandomizedDelaySec=24h
+RandomizedDelaySec=4h
 Persistent=true
 
 [Install]
diff --git a/package/shared/xrpld.service b/package/shared/xrpld.service
index 72b6cc9938..8e10ed2eee 100644
--- a/package/shared/xrpld.service
+++ b/package/shared/xrpld.service
@@ -2,14 +2,15 @@
 Description=XRP Ledger Daemon
 After=network-online.target
 Wants=network-online.target
-StartLimitIntervalSec=300
+StartLimitIntervalSec=5min
 StartLimitBurst=5
 
 [Service]
 Type=simple
 ExecStart=/usr/bin/xrpld --net --silent --conf /etc/xrpld/xrpld.cfg
-Restart=always
+Restart=on-failure
 RestartSec=5s
+TimeoutStopSec=5min
 NoNewPrivileges=true
 ProtectSystem=full
 ProtectHome=true