diff --git a/unit-files/haproxy-confd.service b/unit-files/haproxy-confd.service
index 3b83446f1c2582f19104725e74c18409953c2740..f23d2cb6b1efae64fba3ed22f193540616e49aea 100644
--- a/unit-files/haproxy-confd.service
+++ b/unit-files/haproxy-confd.service
@@ -12,7 +12,6 @@ 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/haproxy.service b/unit-files/haproxy.service
index 5a9b6bfa0deda1793e27b55a06e50e579f6ecc0c..bb352518b94a87656f2b00e0513328c387238a1c 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -9,7 +9,6 @@ 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/nginx-discovery@.service b/unit-files/nginx-discovery@.service
index 8b7a16b14039f866ea1c1b82bf936d60fd782878..d9cd898e30c09557ad47ba391eaab35973f823b0 100644
--- a/unit-files/nginx-discovery@.service
+++ b/unit-files/nginx-discovery@.service
@@ -13,7 +13,6 @@ After=nginx@%i.service
 BindsTo=nginx@%i.service
 
 [Service]
-TimeoutStartSec=0
 # Start
 ## Test whether service is accessible and then register useful information
 ExecStart=/bin/bash -c ' \
diff --git a/unit-files/nginx@.service b/unit-files/nginx@.service
index 053f501b3f1b7f75558152395886611fb6f1b32d..d8830cec67b6496679c85ceb3d8b953a436bf9dd 100644
--- a/unit-files/nginx@.service
+++ b/unit-files/nginx@.service
@@ -13,7 +13,6 @@ Before=%p-discovery@%i.service
 
 [Service]
 Restart=always
-TimeoutStartSec=0
 ExecStartPre=-/usr/bin/docker kill %p-%i
 ExecStartPre=-/usr/bin/docker rm %p-%i
 ExecStart=/usr/bin/docker run \
diff --git a/unit-files/postfix.service b/unit-files/postfix.service
index 0188ff274dc25d1f69b6863b07c8afe66f9eb642..bd2dfaa3ef840633c21cef010d98762765618364 100644
--- a/unit-files/postfix.service
+++ b/unit-files/postfix.service
@@ -9,7 +9,6 @@ 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 \