diff --git a/app/start.sh b/app/start.sh
index 10534525..94db50f4 100755
--- a/app/start.sh
+++ b/app/start.sh
@@ -18,7 +18,7 @@ trap 'term_handler' INT QUIT TERM
 /app/letsencrypt_service &
 letsencrypt_service_pid=$!
 
-wait_default="500ms:2s"
+wait_default="5s:20s"
 DOCKER_GEN_WAIT="${DOCKER_GEN_WAIT:-$wait_default}"
 docker-gen -watch -notify '/app/signal_le_service' -wait "$DOCKER_GEN_WAIT" /app/letsencrypt_service_data.tmpl /app/letsencrypt_service_data &
 docker_gen_pid=$!
diff --git a/test/tests/test-functions.sh b/test/tests/test-functions.sh
index 3e474f59..5ae84961 100755
--- a/test/tests/test-functions.sh
+++ b/test/tests/test-functions.sh
@@ -28,6 +28,7 @@ function run_le_container {
     --volumes-from "$NGINX_CONTAINER_NAME" \
     --volume /var/run/docker.sock:/var/run/docker.sock:ro \
     "${cli_args_arr[@]}" \
+    --env "DOCKER_GEN_WAIT=500ms:2s" \
     --env "TEST_MODE=true" \
     --env "DHPARAM_BITS=256" \
     --env "DEBUG=1" \