diff --git a/test/e2e/e2e-common/src/main/java/org/apache/skywalking/e2e/SkyWalkingAnnotations.java b/test/e2e/e2e-common/src/main/java/org/apache/skywalking/e2e/SkyWalkingAnnotations.java
index ec35971a8..34213cbf5 100644
--- a/test/e2e/e2e-common/src/main/java/org/apache/skywalking/e2e/SkyWalkingAnnotations.java
+++ b/test/e2e/e2e-common/src/main/java/org/apache/skywalking/e2e/SkyWalkingAnnotations.java
@@ -209,7 +209,7 @@ public final class SkyWalkingAnnotations {
         compose.withPull(true)
                .withLocalCompose(true)
                .withTailChildContainers(true)
-               .withRemoveImages(DockerComposeContainer.RemoveImages.LOCAL);
+               .withRemoveImages(DockerComposeContainer.RemoveImages.ALL);
 
         if (IS_CI) {
             initLoggers(files, compose);
diff --git a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml
index e58cf3447..981e30943 100644
--- a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml
+++ b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es6.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml
index 29628ad4c..6138feeae 100644
--- a/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml
+++ b/test/e2e/e2e-test/docker/cluster/docker-compose.zk.es7.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/gateway/docker-compose.yml b/test/e2e/e2e-test/docker/gateway/docker-compose.yml
index 242c63fcc..2af836196 100644
--- a/test/e2e/e2e-test/docker/gateway/docker-compose.yml
+++ b/test/e2e/e2e-test/docker/gateway/docker-compose.yml
@@ -36,6 +36,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml b/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml
index 0294cd110..b80079ac3 100644
--- a/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml
+++ b/test/e2e/e2e-test/docker/profile/docker-compose.es6.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml b/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml
index 07fa318d2..858a5280b 100644
--- a/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml
+++ b/test/e2e/e2e-test/docker/profile/docker-compose.es7.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml
index 0294cd110..b80079ac3 100644
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml
+++ b/test/e2e/e2e-test/docker/storage/docker-compose.es6.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml b/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml
index 07fa318d2..858a5280b 100644
--- a/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml
+++ b/test/e2e/e2e-test/docker/storage/docker-compose.es7.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml b/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml
index ebfe32b12..c3c149a59 100644
--- a/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml
+++ b/test/e2e/e2e-test/docker/ttl/docker-compose.es6.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s
diff --git a/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml b/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml
index 637d5b66f..0d3c48e53 100644
--- a/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml
+++ b/test/e2e/e2e-test/docker/ttl/docker-compose.es7.yml
@@ -24,6 +24,7 @@ services:
       - e2e
     environment:
       - discovery.type=single-node
+      - cluster.routing.allocation.disk.threshold_enabled=false
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/9200"]
       interval: 5s