diff --git a/meta-balena-common/recipes-containers/balena/balena/balena-host.service b/meta-balena-common/recipes-containers/balena/balena/balena-host.service
index fa956f519c..9578af0d24 100644
--- a/meta-balena-common/recipes-containers/balena/balena/balena-host.service
+++ b/meta-balena-common/recipes-containers/balena/balena/balena-host.service
@@ -13,8 +13,14 @@ EnvironmentFile=-/etc/docker/balenahost.env
 ExecStart=/usr/bin/balenad --delta-data-root=/mnt/sysroot/active/balena --delta-storage-driver=@BALENA_STORAGE@ --log-driver=journald -s @BALENA_STORAGE@ --data-root=/mnt/sysroot/inactive/balena -H fd:// --pidfile=/var/run/balena-host.pid --exec-root=/var/run/balena-host --bip 10.114.101.1/24 --fixed-cidr=10.114.101.128/25 --iptables=false --max-download-attempts=10 --exec-opt native.cgroupdriver=systemd
 #Adjust OOMscore to -900 to make killing unlikely
 OOMScoreAdjust=-900
-MountFlags=slave
 LimitNOFILE=1048576
-LimitNPROC=1048576
+LimitNPROC=infinity
 LimitCORE=infinity
+TasksMax=infinity
+TimeoutStartSec=0
+Restart=on-failure
+StartLimitBurst=3
+StartLimitInterval=30s
+Delegate=yes
+KillMode=process
 
diff --git a/meta-balena-common/recipes-containers/balena/balena/balena.service b/meta-balena-common/recipes-containers/balena/balena/balena.service
index 85b7e1b655..eac8148c69 100644
--- a/meta-balena-common/recipes-containers/balena/balena/balena.service
+++ b/meta-balena-common/recipes-containers/balena/balena/balena.service
@@ -13,12 +13,16 @@ ExecStart=/usr/bin/healthdog --healthcheck=/usr/lib/balena/balena-healthcheck /u
 ExecStartPost=/bin/bash -c '/usr/lib/balena/balena-healthcheck-image-load &'
 #Adjust OOMscore to -900 to make killing unlikely
 OOMScoreAdjust=-900
-MountFlags=slave
 LimitNOFILE=1048576
-LimitNPROC=1048576
+LimitNPROC=infinity
 LimitCORE=infinity
+TasksMax=infinity
+TimeoutStartSec=0
 WatchdogSec=360
 Restart=always
+StartLimitBurst=3
+StartLimitInterval=30s
+Delegate=yes
 KillMode=process
 
 [Install]