diff --git a/unit-files/confd.service b/unit-files/confd.service
index 5afe2cbe5dbb45456e20e045b9e66e322cb58ae4..90e1f8ae968950a9c2c3c17acab2b3ebd4588ff3 100644
--- a/unit-files/confd.service
+++ b/unit-files/confd.service
@@ -12,6 +12,7 @@ Before=haproxy.service
 
 [Service]
 Restart=always
+TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
diff --git a/unit-files/email-forwarder.service b/unit-files/email-forwarder.service
index 715e7f8488078bf41de07f3250184ae918948011..56fdd6eded5159065768ef41da4aadefa6e3c9d2 100644
--- a/unit-files/email-forwarder.service
+++ b/unit-files/email-forwarder.service
@@ -9,6 +9,7 @@ After=docker.service
 
 [Service]
 Restart=always
+TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index 57d2d8e1ee0250acd8c77948daebae3729d3b448..ab8a02fcb38dff24ccd4a70706bb22690b7c1a56 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -9,6 +9,7 @@ After=docker.service
 
 [Service]
 Restart=always
+TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index 25cbe2b60d3972374ae764226f7f0fdc0e94d461..2f19e797997765d5b85e76c26ca8f7dd245b15f0 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -13,6 +13,7 @@ BindsTo=lamp@%i.service
 
 [Service]
 Restart=always
+TimeoutStartSec=0
 Type=notify
 NotifyAccess=all
 ExecStartPre=/usr/bin/docker run --rm -v /opt/bin:/opt/bin ibuildthecloud/systemd-docker
diff --git a/unit-files/web@.service b/unit-files/web@.service
index daebddffee57b2b9283a5d34e12e6dd4e3987909..6e0bc306a5b2127696c01420c98e3dff93d40d5d 100644
--- a/unit-files/web@.service
+++ b/unit-files/web@.service
@@ -13,6 +13,7 @@ Before=backup@%i.timer
 
 [Service]
 Restart=always
+TimeoutStartSec=0
 Type=notify
 NotifyAccess=all
 EnvironmentFile=/data/domains/%i/.env