diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index d96dd96e08861394e3c602df06865a0af79f9a31..cbd231b04578b5f8bce56719983866cc6ab44206 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -7,8 +7,6 @@ Requires=%p-importer@%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\
 --name %p-%i\
diff --git a/unit-files/wordpress-discovery@.service b/unit-files/wordpress-discovery@.service
index 94b2cd219d254d96ee0f610de36e099b78951d23..58024118402b461fc7fa01ea79283632f78af806 100644
--- a/unit-files/wordpress-discovery@.service
+++ b/unit-files/wordpress-discovery@.service
@@ -13,7 +13,6 @@ BindsTo=wordpress@%i.service
 [Service]
 
 EnvironmentFile=/etc/environment
-TimeoutStartSec=0
 # Start
 ## Test whether service is accessible and then register useful information
 ExecStart=/bin/bash -c '\
diff --git a/unit-files/wordpress@.service b/unit-files/wordpress@.service
index 96a540222c9442864553a95837133aad6688de40..bad7e05f25d5ba5edbe6af1ec223f92d1edaa468 100644
--- a/unit-files/wordpress@.service
+++ b/unit-files/wordpress@.service
@@ -14,7 +14,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\