diff --git a/cluster/agent/stacks/01-elasticsearch-cluster.ampmon.yml b/cluster/agent/stacks/01-elasticsearch-cluster.ampmon.yml
index 2fc2e4e3d..254ed54a8 100644
--- a/cluster/agent/stacks/01-elasticsearch-cluster.ampmon.yml
+++ b/cluster/agent/stacks/01-elasticsearch-cluster.ampmon.yml
@@ -18,8 +18,8 @@ services:
       - elasticsearch-data:/opt/elasticsearch/data
     labels:
       io.amp.role: "infrastructure"
-      amp.service.stabilize.delay: "35s"
-      amp.service.stabilize.timeout: "90s"
+      amp.service.stabilize.delay: "45s"
+      amp.service.stabilize.timeout: "180s"
     environment:
       MIN_MASTER_NODES: 2
       NETWORK_HOST: "_eth0_"
diff --git a/cluster/agent/stacks/01-elasticsearch-cluster.test.yml b/cluster/agent/stacks/01-elasticsearch-cluster.test.yml
index 76f03f38c..6796a8dd0 100644
--- a/cluster/agent/stacks/01-elasticsearch-cluster.test.yml
+++ b/cluster/agent/stacks/01-elasticsearch-cluster.test.yml
@@ -11,7 +11,7 @@ services:
     image: appcelerator/alpine:3.6.0
     networks:
       - default
-    command: ["curl", "-sfm", "55", "${AMP_STACK:-amp}_elasticsearch:9200/_cluster/health?wait_for_status=green&timeout=50s" ]
+    command: ["curl", "-sfm", "65", "${AMP_STACK:-amp}_elasticsearch:9200/_cluster/health?wait_for_status=green&timeout=60s" ]
     labels:
       io.amp.role: "infrastructure"
       io.amp.test:
diff --git a/cluster/agent/stacks/01-elasticsearch-single.ampmon.yml b/cluster/agent/stacks/01-elasticsearch-single.ampmon.yml
index 987779e18..006ba0179 100644
--- a/cluster/agent/stacks/01-elasticsearch-single.ampmon.yml
+++ b/cluster/agent/stacks/01-elasticsearch-single.ampmon.yml
@@ -18,8 +18,8 @@ services:
       - elasticsearch-data:/opt/elasticsearch/data
     labels:
       io.amp.role: "infrastructure"
-      amp.service.stabilize.delay: "10s"
-      amp.service.stabilize.timeout: "30s"
+      amp.service.stabilize.delay: "15s"
+      amp.service.stabilize.timeout: "35s"
     environment:
       NETWORK_HOST: "_eth0_"
       JAVA_HEAP_SIZE: "${ES_JAVA_HEAP_SIZE:-1024}"
diff --git a/cluster/agent/stacks/01-etcd-cluster.ampcore.yml b/cluster/agent/stacks/01-etcd-cluster.ampcore.yml
index d6595c7eb..8b8ab982c 100644
--- a/cluster/agent/stacks/01-etcd-cluster.ampcore.yml
+++ b/cluster/agent/stacks/01-etcd-cluster.ampcore.yml
@@ -24,8 +24,8 @@ services:
       - "http://etcd:2379"
     labels:
       io.amp.role: "infrastructure"
-      amp.service.stabilize.delay: "10s"
-      amp.service.stabilize.timeout: "30s"
+      amp.service.stabilize.delay: "20s"
+      amp.service.stabilize.timeout: "40s"
     deploy:
       mode: replicated
       replicas: 3
diff --git a/cluster/agent/stacks/01-etcd-single.ampcore.yml b/cluster/agent/stacks/01-etcd-single.ampcore.yml
index daccadc4d..39c78521a 100644
--- a/cluster/agent/stacks/01-etcd-single.ampcore.yml
+++ b/cluster/agent/stacks/01-etcd-single.ampcore.yml
@@ -24,8 +24,8 @@ services:
       - "http://etcd:2379"
     labels:
       io.amp.role: "infrastructure"
-      amp.service.stabilize.delay: "5s"
-      amp.service.stabilize.timeout: "30s"
+      amp.service.stabilize.delay: "6s"
+      amp.service.stabilize.timeout: "40s"
     deploy:
       mode: replicated
       replicas: 1