diff --git a/setup/container/systemd/apphealthtask.service b/setup/container/systemd/apphealthtask.service
index b943e0974..053871962 100644
--- a/setup/container/systemd/apphealthtask.service
+++ b/setup/container/systemd/apphealthtask.service
@@ -12,5 +12,4 @@ Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box*,connect-lastmi
 KillMode=process
 User=yellowtent
 Group=yellowtent
-Restart=on-failure
 MemoryLimit=50M
diff --git a/setup/container/systemd/box.service b/setup/container/systemd/box.service
index 8df645751..7781b142a 100644
--- a/setup/container/systemd/box.service
+++ b/setup/container/systemd/box.service
@@ -12,6 +12,5 @@ Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box*,connect-lastmi
 KillMode=process
 User=yellowtent
 Group=yellowtent
-Restart=on-failure
 MemoryLimit=700M
 
diff --git a/setup/container/systemd/cloudron.target b/setup/container/systemd/cloudron.target
index 33909c848..c1d70d288 100644
--- a/setup/container/systemd/cloudron.target
+++ b/setup/container/systemd/cloudron.target
@@ -2,8 +2,7 @@
 Description=Cloudron Smart Cloud
 Documentation=https://cloudron.io/documentation.html
 StopWhenUnneeded=true
-Requires=multi-user.target
-Wants=apphealthtask.service box.service janitor.service oauthproxy.service
+Requires=apphealthtask.service box.service janitor.service oauthproxy.service
 After=apphealthtask.service box.service janitor.service oauthproxy.service
 # AllowIsolate=yes
 
diff --git a/setup/container/systemd/crashnotifier@.service b/setup/container/systemd/crashnotifier@.service
index 956567e4f..b754502cd 100644
--- a/setup/container/systemd/crashnotifier@.service
+++ b/setup/container/systemd/crashnotifier@.service
@@ -12,5 +12,4 @@ Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box*,connect-lastmi
 KillMode=process
 User=yellowtent
 Group=yellowtent
-Restart=on-failure
 
diff --git a/setup/container/systemd/janitor.service b/setup/container/systemd/janitor.service
index 3d72a0b06..d930758f8 100644
--- a/setup/container/systemd/janitor.service
+++ b/setup/container/systemd/janitor.service
@@ -12,6 +12,5 @@ Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box*,connect-lastmi
 KillMode=process
 User=yellowtent
 Group=yellowtent
-Restart=on-failure
 MemoryLimit=50M
 
diff --git a/setup/container/systemd/oauthproxy.service b/setup/container/systemd/oauthproxy.service
index d51ea0a2a..bec5db226 100644
--- a/setup/container/systemd/oauthproxy.service
+++ b/setup/container/systemd/oauthproxy.service
@@ -12,6 +12,5 @@ Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box*,connect-lastmi
 KillMode=process
 User=yellowtent
 Group=yellowtent
-Restart=on-failure
 MemoryLimit=50M