diff --git a/unit-files/confd.service b/unit-files/confd.service
index 5bb5e7ef74a743632607c6877efefd4a649cf9e4..3b09cc4f6c233ce08d9f1a5f160b013c1ab70b4b 100644
--- a/unit-files/confd.service
+++ b/unit-files/confd.service
@@ -12,6 +12,7 @@ Before=haproxy.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
diff --git a/unit-files/email-forwarder.service b/unit-files/email-forwarder.service
index ad23563baf4a86a3f2ea22e5afa0e5690fdc79ac..098b6f2b5a7e978f755b66d403a69ca102688686 100644
--- a/unit-files/email-forwarder.service
+++ b/unit-files/email-forwarder.service
@@ -9,6 +9,7 @@ After=docker.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index ab8a02fcb38dff24ccd4a70706bb22690b7c1a56..6345b4ccd96c30ee8c0a758bc737eb5e4b8b38cd 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -9,6 +9,7 @@ After=docker.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index 2f19e797997765d5b85e76c26ca8f7dd245b15f0..5892aec4d9e6bd6eefcd3c3e81f2af547f423908 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -13,6 +13,7 @@ BindsTo=lamp@%i.service
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 Type=notify
 NotifyAccess=all
diff --git a/unit-files/static@.service b/unit-files/static@.service
index 12be287575fe16fedf307b9b102c21516d177112..13905b677b8a972c81f94fad114481b342826733 100644
--- a/unit-files/static@.service
+++ b/unit-files/static@.service
@@ -8,6 +8,8 @@ Requires=web@%i.service
 Before=web@%i.service
 
 [Service]
+Type=oneshot
+RemainAfterExit=yes
 ExecStart=/bin/bash -euxc ' \
   application_folder=/data/domains/%i/%p/www-content; \
   if [ ! -d $application_folder ]; then \
diff --git a/unit-files/web@.service b/unit-files/web@.service
index 6e0bc306a5b2127696c01420c98e3dff93d40d5d..70005339eacbca9a52808bff1d5371a2e4605563 100644
--- a/unit-files/web@.service
+++ b/unit-files/web@.service
@@ -13,6 +13,7 @@ Before=backup@%i.timer
 
 [Service]
 Restart=always
+RestartSec=20
 TimeoutStartSec=0
 Type=notify
 NotifyAccess=all