diff --git a/unit-files/static-discovery@.service b/unit-files/static-discovery@.service
index 94de75af84f68774500e9473ba9db641741e3fe2..83ddef70cfb12a7b4ca342f3f00290fa5c6d8dcf 100644
--- a/unit-files/static-discovery@.service
+++ b/unit-files/static-discovery@.service
@@ -14,7 +14,7 @@ BindsTo=static@%i.service
 [Service]
 # Start
 ## Test whether service is accessible and then register useful information
-ExecStart=/bin/bash -euxc ' \
+ExecStart=/bin/bash -c ' \
   sleep 3; \
   while true; do \
     app=`echo %p | cut -d"-" -f1`; \
diff --git a/unit-files/static-git-discovery@.service b/unit-files/static-git-discovery@.service
index 466a0b96982c812fa432ff845d6d76acbc9566bd..2ff4c717a39b4a6fb0ce34a6f67c2eae4cf24764 100644
--- a/unit-files/static-git-discovery@.service
+++ b/unit-files/static-git-discovery@.service
@@ -14,7 +14,7 @@ BindsTo=static-git@%i.service
 [Service]
 # Start
 ## Test whether service is accessible and then register useful information
-ExecStart=/bin/bash -euxc ' \
+ExecStart=/bin/bash -c ' \
   sleep 3; \
   while true; do \
     app=`echo %p | cut -d"-" -f1,2`; \
diff --git a/unit-files/wordpress-discovery@.service b/unit-files/wordpress-discovery@.service
index 804d5e1ef9bccc19259e462491bdbe3e89e94db3..a5ef99d62c7f51de37c8f547005840e40dc93586 100644
--- a/unit-files/wordpress-discovery@.service
+++ b/unit-files/wordpress-discovery@.service
@@ -14,8 +14,8 @@ BindsTo=wordpress@%i.service
 [Service]
 # Start
 ## Test whether service is accessible and then register useful information
-ExecStart=/bin/bash -euxc ' \
-  sleep 3; \
+ExecStart=/bin/bash -c ' \
+  sleep 30; \
   while true; do \
     app=`echo %p | cut -d"-" -f1`; \
     ip=`docker inspect --format \'{{.NetworkSettings.IPAddress}}\' $app-%i`; \