diff --git a/gordo/cli/workflow_generator.py b/gordo/cli/workflow_generator.py
index afce9996e..2fdecd292 100644
--- a/gordo/cli/workflow_generator.py
+++ b/gordo/cli/workflow_generator.py
@@ -347,6 +347,20 @@ def workflow_cli(gordo_ctx):
     type=int,
     default=50,
 )
+@click.option(
+    "--gordo-server-readiness-initial-delay",
+    help="initialDelaySeconds for gordo-server's readinessProbe",
+    envvar=f"{PREFIX}_GORDO_SERVER_READINESS_INITIAL_DELAY",
+    type=int,
+    default=20,
+)
+@click.option(
+    "--gordo-server-liveness-initial-delay",
+    help="initialDelaySeconds for gordo-server's livenessProbe",
+    envvar=f"{PREFIX}_GORDO_SERVER_LIVENESS_INITIAL_DELAY",
+    type=int,
+    default=5,
+)
 @click.pass_context
 def workflow_generator_cli(gordo_ctx, **ctx):
     """
diff --git a/gordo/workflow/workflow_generator/resources/argo-workflow.yml.template b/gordo/workflow/workflow_generator/resources/argo-workflow.yml.template
index a7f62aecd..d9c8fbb9b 100644
--- a/gordo/workflow/workflow_generator/resources/argo-workflow.yml.template
+++ b/gordo/workflow/workflow_generator/resources/argo-workflow.yml.template
@@ -1084,13 +1084,13 @@ spec:
                                httpGet:
                                  path: /healthcheck
                                  port: http-api
-                               initialDelaySeconds: 600 # We give it a lot of time to load the model and start up
+                               initialDelaySeconds: {{ gordo_server_liveness_initial_delay|default(5, true) }}
                                timeoutSeconds: {{ gordo_server_probe_timeout|default(5, true) }}
                              readinessProbe:
                                httpGet:
                                  path: /healthcheck
                                  port: http-api
-                               initialDelaySeconds: 5
+                               initialDelaySeconds: {{ gordo_server_readiness_initial_delay|default(20, true) }}
                                timeoutSeconds: {{ gordo_server_probe_timeout|default(5, true) }}
                              env:
                                - name: MODEL_COLLECTION_DIR