diff --git a/.github/actions/infra-e2e-test/action.yml b/.github/actions/infra-e2e-test/action.yml
index 4ee6545576158902666948a3ce5c680e2ce7cf87..964585246d1b3adad20389da763ad938c76c140a 100644
--- a/.github/actions/infra-e2e-test/action.yml
+++ b/.github/actions/infra-e2e-test/action.yml
@@ -58,3 +58,9 @@ runs:
       uses: apache/skywalking-infra-e2e@main
       with:
         e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/${{ inputs.config-file }}
+    - uses: actions/upload-artifact@v2
+      if: ${{ failure() }}
+      name: Upload Logs
+      with:
+        name: logs
+        path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
diff --git a/.github/workflows/e2e.istio.yaml b/.github/workflows/e2e.istio.yaml
index 32e8df56c91761037c6efc73a26c270d794ca226..c6be8327f330a33ef18785034da8cd94779f6b38 100644
--- a/.github/workflows/e2e.istio.yaml
+++ b/.github/workflows/e2e.istio.yaml
@@ -27,7 +27,6 @@ on:
 env:
   SKIP_TEST: true
   TAG: ${{ github.sha }}
-  SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk11:alpine-jre
 
 concurrency:
   group: e2e-istio-${{ github.event.pull_request.number || github.ref }}
@@ -80,4 +79,4 @@ jobs:
         if: env.SKIP_CI != 'true'
         uses: ./.github/actions/infra-e2e-test
         with:
-          config-file: istio/metrics/e2e.yaml
\ No newline at end of file
+          config-file: istio/metrics/e2e.yaml
diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml
index 36db82e75502f3d1096aa2c9a27f7a4be8405e92..23f8d11ce427ac355a69efae3d1a8b268608794c 100644
--- a/.github/workflows/e2e.jdk-versions.yaml
+++ b/.github/workflows/e2e.jdk-versions.yaml
@@ -36,7 +36,7 @@ jobs:
         jdk: [ 8, 11, 12, 13, 14, 15, 16 ]
     env:
       SW_AGENT_JDK_VERSION: ${{ matrix.jdk }}
-      SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:alpine-jre
+      SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:jre
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index ddba718bc0615d14857b36f95c31a66f1b8d8534..6cdb3fbb58b133c3f46be9152d13d593dc669eee 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -52,7 +52,5 @@ jobs:
           registry: ${{ env.HUB }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build docker image
-        run: |
-          make docker || make docker
-          make docker.push || make docker.push
+      - name: Build and push docker images
+        run: make build.all docker.push
diff --git a/CHANGES.md b/CHANGES.md
index 8fd812759220ab49c523ad25f7a861947b4d5dc3..e448ff9d7a5c56d99993660f010320827811291d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Release Notes.
 
 * E2E tests immigrate to e2e-v2.
 * Support JDK 16 and 17.
+* Add Docker images for arm64 architecture.
 
 #### OAP Server
 
diff --git a/Makefile b/Makefile
index 7aa6b248109cb168d052f3be59997e6768077c42..de38f9738e277e8fe49aa9d59687aed3ca62b654 100644
--- a/Makefile
+++ b/Makefile
@@ -43,64 +43,47 @@ OAP_NAME ?= oap
 UI_NAME ?= ui
 TAG ?= latest
 
-.SECONDEXPANSION: #allow $@ to be used in dependency list
-
-.PHONY: docker docker.all docker.oap
+.PHONY: docker docker.all
 
 docker: init build.all docker.all
 
 DOCKER_TARGETS:=docker.oap docker.ui
 
-docker.all: $(DOCKER_TARGETS)
-
 ifneq ($(SW_OAP_BASE_IMAGE),)
   BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
 endif
 
 BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST) --build-arg SKYWALKING_CLI_VERSION=$(CLI_VERSION)
 
-docker.oap: $(CONTEXT)/$(DIST)
-docker.oap: $(SW_ROOT)/docker/oap/Dockerfile.oap
-docker.oap: $(SW_ROOT)/docker/oap/docker-entrypoint.sh
-docker.oap: $(SW_ROOT)/docker/oap/log4j2.xml
-docker.oap: NAME = $(OAP_NAME)
-docker.oap:
-	$(DOCKER_RULE)
+%.ui: NAME = $(UI_NAME)
+%.oap: NAME = $(OAP_NAME)
 
-docker.ui: $(CONTEXT)/$(DIST)
-docker.ui: $(SW_ROOT)/docker/ui/Dockerfile.ui
-docker.ui: $(SW_ROOT)/docker/ui/docker-entrypoint.sh
-docker.ui: $(SW_ROOT)/docker/ui/logback.xml
-docker.ui: NAME = $(UI_NAME)
-docker.ui:
+docker.%: PLATFORMS =
+docker.%: LOAD_OR_PUSH = --load
+push.%: PLATFORMS = --platform linux/amd64,linux/arm64
+push.%: LOAD_OR_PUSH = --push
+
+docker.% push.docker.%: $(CONTEXT)/$(DIST) $(SW_ROOT)/docker/%/*
 	$(DOCKER_RULE)
 
-# $@ is the name of the target
+docker.all: $(DOCKER_TARGETS)
+docker.push: $(DOCKER_TARGETS:%=push.%)
+
 # $^ the name of the dependencies for the target
 # Rule Steps #
 ##############
-# 1. Make a directory $(DOCKER_BUILD_TOP)/%@
-# 2. This rule uses cp to copy all dependency filenames into into $(DOCKER_BUILD_TOP/$@
-# 3. This rule then changes directories to $(DOCKER_BUID_TOP)/$@
-# 4. This rule runs $(BUILD_PRE) prior to any docker build and only if specified as a dependency variable
-# 5. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
-
-DOCKER_RULE=time (mkdir -p $(DOCKER_BUILD_TOP)/$@ && cp -r $^ $(DOCKER_BUILD_TOP)/$@ && cd $(DOCKER_BUILD_TOP)/$@ && $(BUILD_PRE) docker build --no-cache $(BUILD_ARGS) -t $(HUB)/$(NAME):$(TAG) -f Dockerfile$(suffix $@) .)
-
-# for each docker.XXX target create a push.docker.XXX target that pushes
-# the local docker image to another hub
-# a possible optimization is to use tag.$(TGT) as a dependency to do the tag for us
-push.docker.oap: NAME = $(OAP_NAME)
-push.docker.ui: NAME = $(UI_NAME)
-
-$(foreach TGT,$(DOCKER_TARGETS),push.$(TGT)): push.%: %
-	time (docker push $(HUB)/$(NAME):$(TAG))
-
-# create a DOCKER_PUSH_TARGETS that's each of DOCKER_TARGETS with a push. prefix
-DOCKER_PUSH_TARGETS:=
-$(foreach TGT,$(DOCKER_TARGETS),$(eval DOCKER_PUSH_TARGETS+=push.$(TGT)))
-
-# Will build and push docker images.
-docker.push: $(DOCKER_PUSH_TARGETS)
-
-
+# 1. Make a directory $(DOCKER_BUILD_TOP)/$(NAME)
+# 2. This rule uses cp to copy all dependency filenames into into $(DOCKER_BUILD_TOP/$(NAME)
+# 3. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
+
+define DOCKER_RULE
+	mkdir -p $(DOCKER_BUILD_TOP)/$(NAME)
+	cp -r $^ $(DOCKER_BUILD_TOP)/$(NAME)
+	docker buildx create --use --driver docker-container --name skywalking_main > /dev/null 2>&1 || true
+	docker buildx build $(PLATFORMS) $(LOAD_OR_PUSH) \
+		--no-cache $(BUILD_ARGS) \
+		-t $(HUB)/$(NAME):$(TAG) \
+		-t $(HUB)/$(NAME):latest \
+		$(DOCKER_BUILD_TOP)/$(NAME)
+	docker buildx rm skywalking_main || true
+endef
diff --git a/docker/oap/Dockerfile.oap b/docker/oap/Dockerfile
similarity index 91%
rename from docker/oap/Dockerfile.oap
rename to docker/oap/Dockerfile
index 02b99ca770d2b935b4ccdc050f6d90a7e5822f49..c6742cabe1cecc143264b321cafb4f70c3341e84 100644
--- a/docker/oap/Dockerfile.oap
+++ b/docker/oap/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine'
+ARG BASE_IMAGE='adoptopenjdk/openjdk11:jre'
 
 ARG SKYWALKING_CLI_VERSION
 
@@ -22,8 +22,6 @@ FROM apache/skywalking-cli:$SKYWALKING_CLI_VERSION as cli
 
 FROM $BASE_IMAGE
 
-RUN apk add --no-cache openssl
-
 WORKDIR /skywalking
 
 ENV JAVA_OPTS=" -Xms2G "
@@ -51,4 +49,4 @@ RUN mkdir ext-config; \
 
 EXPOSE 12800 11800 1234
 
-ENTRYPOINT ["sh", "docker-entrypoint.sh"]
+ENTRYPOINT ["bash", "docker-entrypoint.sh"]
diff --git a/docker/ui/Dockerfile.ui b/docker/ui/Dockerfile
similarity index 92%
rename from docker/ui/Dockerfile.ui
rename to docker/ui/Dockerfile
index 760631c455fa8785824173ddf608ce58622334f6..904e593b8b3c5bf1b94a34bf4f7767fd7a6bf496 100644
--- a/docker/ui/Dockerfile.ui
+++ b/docker/ui/Dockerfile
@@ -14,17 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM adoptopenjdk/openjdk11:alpine-jre
+FROM adoptopenjdk/openjdk11:jre
 
 ENV JAVA_OPTS=" -Xms256M " \
     SW_OAP_ADDRESS="http://127.0.0.1:12800"
 
 WORKDIR skywalking
 
-RUN set -ex; \
-    apk add --no-cache \
-    bash
-
 ARG DIST
 COPY "$DIST" .
 
diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md
index 4604ccc03e4347c9dee408c560f7dc63a1967809..73b2a8496ac60ef6f69c6ef59c8edbe633787864 100644
--- a/docs/en/guides/How-to-release.md
+++ b/docs/en/guides/How-to-release.md
@@ -297,7 +297,7 @@ export OAP_NAME=skywalking-oap-server
 export UI_NAME=skywalking-ui
 export TAG=$SW_VERSION
 export DIST=<the binary package name inside (1), e.g. apache-skywalking-apm-8.8.0.tar.gz>
-make docker.all && make docker.push
+make docker.push
 ```
 
 ## Clean up the old releases
diff --git a/test/e2e-v2/cases/alarm/es/e2e.yaml b/test/e2e-v2/cases/alarm/es/e2e.yaml
index 843d2175e24b2dd937c8acbad3fce78db8a50150..a44a76b32afcef0d4d8772d69f1d8a978a8f5e26 100644
--- a/test/e2e-v2/cases/alarm/es/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/es/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/alarm/h2/e2e.yaml b/test/e2e-v2/cases/alarm/h2/e2e.yaml
index 843d2175e24b2dd937c8acbad3fce78db8a50150..a44a76b32afcef0d4d8772d69f1d8a978a8f5e26 100644
--- a/test/e2e-v2/cases/alarm/h2/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/h2/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/alarm/influxdb/e2e.yaml b/test/e2e-v2/cases/alarm/influxdb/e2e.yaml
index 843d2175e24b2dd937c8acbad3fce78db8a50150..a44a76b32afcef0d4d8772d69f1d8a978a8f5e26 100644
--- a/test/e2e-v2/cases/alarm/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/influxdb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/alarm/mysql/docker-compose.yml b/test/e2e-v2/cases/alarm/mysql/docker-compose.yml
index f8dfa37df0b52bd8e257a31bff66882c32e59fa9..bcbe40fd7196f260363bc722db8c172dcf85f7b8 100644
--- a/test/e2e-v2/cases/alarm/mysql/docker-compose.yml
+++ b/test/e2e-v2/cases/alarm/mysql/docker-compose.yml
@@ -39,7 +39,7 @@ services:
     environment:
       SW_STORAGE: mysql
       SW_SEARCHABLE_ALARM_TAG_KEYS: level,receivers
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     ports:
       - 12800
     depends_on:
diff --git a/test/e2e-v2/cases/alarm/mysql/e2e.yaml b/test/e2e-v2/cases/alarm/mysql/e2e.yaml
index 843d2175e24b2dd937c8acbad3fce78db8a50150..a44a76b32afcef0d4d8772d69f1d8a978a8f5e26 100644
--- a/test/e2e-v2/cases/alarm/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/mysql/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/alarm/postgres/e2e.yaml b/test/e2e-v2/cases/alarm/postgres/e2e.yaml
index 843d2175e24b2dd937c8acbad3fce78db8a50150..a44a76b32afcef0d4d8772d69f1d8a978a8f5e26 100644
--- a/test/e2e-v2/cases/alarm/postgres/e2e.yaml
+++ b/test/e2e-v2/cases/alarm/postgres/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/browser/e2e.yaml b/test/e2e-v2/cases/browser/e2e.yaml
index d265ecd347693b5a8122b469f6bdbc3aea473558..9d871fd94bed4a77a9b02b9aa3733ef20c55e837 100644
--- a/test/e2e-v2/cases/browser/e2e.yaml
+++ b/test/e2e-v2/cases/browser/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
@@ -111,4 +111,4 @@ verify:
     - expected: expected/trace-detail.yml
       query: |
         swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql trace $( \
-          swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql trace ls | grep -A 5 'index.html' | tail -n1 | awk -F ' ' '{print $2}')
\ No newline at end of file
+          swctl --display yaml --base-url=http://${oap_host}:${oap_12800}/graphql trace ls | grep -A 5 'index.html' | tail -n1 | awk -F ' ' '{print $2}')
diff --git a/test/e2e-v2/cases/cluster/zk/es/e2e.yaml b/test/e2e-v2/cases/cluster/zk/es/e2e.yaml
index 89dedd81e9d4cec88fcb6df3ed0b069382947eb3..f7b4feea42e58c41365e07267e08544a3378f525 100644
--- a/test/e2e-v2/cases/cluster/zk/es/e2e.yaml
+++ b/test/e2e-v2/cases/cluster/zk/es/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/cluster/zk/influxdb/e2e.yaml b/test/e2e-v2/cases/cluster/zk/influxdb/e2e.yaml
index 89dedd81e9d4cec88fcb6df3ed0b069382947eb3..f7b4feea42e58c41365e07267e08544a3378f525 100644
--- a/test/e2e-v2/cases/cluster/zk/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/cluster/zk/influxdb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml b/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml
index 7700e9461d2be066c1fa2e089cd089ebeaf83767..4c630561427c38f142e51663b8b79d50f6854517 100644
--- a/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml
+++ b/test/e2e-v2/cases/cluster/zk/mysql/docker-compose.yml
@@ -51,7 +51,7 @@ services:
     environment:
       SW_CLUSTER: zookeeper
       SW_STORAGE: mysql
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     depends_on:
       zk:
         condition: service_healthy
@@ -65,7 +65,7 @@ services:
     environment:
       SW_CLUSTER: zookeeper
       SW_STORAGE: mysql
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     depends_on:
       zk:
         condition: service_healthy
diff --git a/test/e2e-v2/cases/cluster/zk/mysql/e2e.yaml b/test/e2e-v2/cases/cluster/zk/mysql/e2e.yaml
index 89dedd81e9d4cec88fcb6df3ed0b069382947eb3..f7b4feea42e58c41365e07267e08544a3378f525 100644
--- a/test/e2e-v2/cases/cluster/zk/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/cluster/zk/mysql/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/event/es/e2e.yaml b/test/e2e-v2/cases/event/es/e2e.yaml
index 80d4f810d942e803f1ef06fddae4b98816320125..fe22de0422a246fdd1bd4dd540c91b9f9fa236ac 100644
--- a/test/e2e-v2/cases/event/es/e2e.yaml
+++ b/test/e2e-v2/cases/event/es/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/event/h2/e2e.yaml b/test/e2e-v2/cases/event/h2/e2e.yaml
index 80d4f810d942e803f1ef06fddae4b98816320125..fe22de0422a246fdd1bd4dd540c91b9f9fa236ac 100644
--- a/test/e2e-v2/cases/event/h2/e2e.yaml
+++ b/test/e2e-v2/cases/event/h2/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/event/influxdb/e2e.yaml b/test/e2e-v2/cases/event/influxdb/e2e.yaml
index 80d4f810d942e803f1ef06fddae4b98816320125..fe22de0422a246fdd1bd4dd540c91b9f9fa236ac 100644
--- a/test/e2e-v2/cases/event/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/event/influxdb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/event/mysql/docker-compose.yml b/test/e2e-v2/cases/event/mysql/docker-compose.yml
index 39f77b5a9173fa41b767f07cbabfc7bb6ac97154..022e623a066142d0537509b8b1b25fc5a9703727 100644
--- a/test/e2e-v2/cases/event/mysql/docker-compose.yml
+++ b/test/e2e-v2/cases/event/mysql/docker-compose.yml
@@ -41,7 +41,7 @@ services:
     depends_on:
       mysql:
         condition: service_healthy
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     ports:
     - 11800
     - 12800
diff --git a/test/e2e-v2/cases/event/mysql/e2e.yaml b/test/e2e-v2/cases/event/mysql/e2e.yaml
index 80d4f810d942e803f1ef06fddae4b98816320125..fe22de0422a246fdd1bd4dd540c91b9f9fa236ac 100644
--- a/test/e2e-v2/cases/event/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/event/mysql/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/gateway/e2e.yaml b/test/e2e-v2/cases/gateway/e2e.yaml
index 88fa85c3293b1e61d419eb7315c8f2815a6f23b5..f4e35f0229902b938e74f1f4e742ac0fcc7a366e 100644
--- a/test/e2e-v2/cases/gateway/e2e.yaml
+++ b/test/e2e-v2/cases/gateway/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/go/e2e.yaml b/test/e2e-v2/cases/go/e2e.yaml
index e3669b8a0841572d5813c60c3402b34192d29b16..608a16b4a54e3e7b115c87d00f25f6cf22480cf6 100644
--- a/test/e2e-v2/cases/go/e2e.yaml
+++ b/test/e2e-v2/cases/go/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/kafka/log/e2e.yaml b/test/e2e-v2/cases/kafka/log/e2e.yaml
index 28e6f2ac9ed5d65128525623a09aa1056441a85a..8ab4bbfb06edf889b5ebf5d9ee9c1a78621ae8ad 100644
--- a/test/e2e-v2/cases/kafka/log/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/log/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/kafka/meter/e2e.yaml b/test/e2e-v2/cases/kafka/meter/e2e.yaml
index e59b7b934f8ebe37f629b8fbc7b02ff291720167..4fff53555d285df253aa39774a79856086174d00 100644
--- a/test/e2e-v2/cases/kafka/meter/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/meter/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/kafka/profile/e2e.yaml b/test/e2e-v2/cases/kafka/profile/e2e.yaml
index e08a36f639c6ca841b35c68adfccda1f0cea393f..f4fcec35bcef8fec8a41c3c4003d35c927f8258c 100644
--- a/test/e2e-v2/cases/kafka/profile/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/profile/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml b/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
index 520c2f0793171de9574e6b0b0ed1a41892f94e0b..0c9d3b43ab85c71d21324423f98b7ff7a2eba0cf 100644
--- a/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
+++ b/test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/log/es/e2e.yaml b/test/e2e-v2/cases/log/es/e2e.yaml
index 72560285d6c6763b63aa7c0357d3bffd2701f7ae..1edeacf1e3407697fb81d8cd8df68abfbd3acf04 100644
--- a/test/e2e-v2/cases/log/es/e2e.yaml
+++ b/test/e2e-v2/cases/log/es/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/log/fluent-bit/e2e.yaml b/test/e2e-v2/cases/log/fluent-bit/e2e.yaml
index 72560285d6c6763b63aa7c0357d3bffd2701f7ae..1edeacf1e3407697fb81d8cd8df68abfbd3acf04 100644
--- a/test/e2e-v2/cases/log/fluent-bit/e2e.yaml
+++ b/test/e2e-v2/cases/log/fluent-bit/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/log/h2/e2e.yaml b/test/e2e-v2/cases/log/h2/e2e.yaml
index 72560285d6c6763b63aa7c0357d3bffd2701f7ae..1edeacf1e3407697fb81d8cd8df68abfbd3acf04 100644
--- a/test/e2e-v2/cases/log/h2/e2e.yaml
+++ b/test/e2e-v2/cases/log/h2/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/log/influxdb/e2e.yaml b/test/e2e-v2/cases/log/influxdb/e2e.yaml
index 72560285d6c6763b63aa7c0357d3bffd2701f7ae..1edeacf1e3407697fb81d8cd8df68abfbd3acf04 100644
--- a/test/e2e-v2/cases/log/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/log/influxdb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/log/mysql/docker-compose.yml b/test/e2e-v2/cases/log/mysql/docker-compose.yml
index 8581a92492939549d74f65869c744aa69f02996e..5b69d27ab1b5788c046a414936a640a7f16abcf4 100644
--- a/test/e2e-v2/cases/log/mysql/docker-compose.yml
+++ b/test/e2e-v2/cases/log/mysql/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest
     ports:
       - 12800
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     networks:
       - e2e
     depends_on:
diff --git a/test/e2e-v2/cases/log/mysql/e2e.yaml b/test/e2e-v2/cases/log/mysql/e2e.yaml
index 72560285d6c6763b63aa7c0357d3bffd2701f7ae..1edeacf1e3407697fb81d8cd8df68abfbd3acf04 100644
--- a/test/e2e-v2/cases/log/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/log/mysql/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/log/postgres/e2e.yaml b/test/e2e-v2/cases/log/postgres/e2e.yaml
index 72560285d6c6763b63aa7c0357d3bffd2701f7ae..1edeacf1e3407697fb81d8cd8df68abfbd3acf04 100644
--- a/test/e2e-v2/cases/log/postgres/e2e.yaml
+++ b/test/e2e-v2/cases/log/postgres/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/lua/e2e.yaml b/test/e2e-v2/cases/lua/e2e.yaml
index ddbd1c63bdaac28c6785cdb1140a54ff2439bda7..6cfffa777408e6f3e12d9ee482d636a37e983b68 100644
--- a/test/e2e-v2/cases/lua/e2e.yaml
+++ b/test/e2e-v2/cases/lua/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/meter/e2e.yaml b/test/e2e-v2/cases/meter/e2e.yaml
index b7c3fab0e59f6675dd944bab93562b1059fc7d5f..ad8f557d9b663c3b9e9a442930cb9c0555753fe9 100644
--- a/test/e2e-v2/cases/meter/e2e.yaml
+++ b/test/e2e-v2/cases/meter/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/nodejs/e2e.yaml b/test/e2e-v2/cases/nodejs/e2e.yaml
index 51352be2b6e2fc0cdbf918da6f1c56f74adb3fb2..eb063ee1c32707a47647b93652ee0896d996a852 100644
--- a/test/e2e-v2/cases/nodejs/e2e.yaml
+++ b/test/e2e-v2/cases/nodejs/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/php/e2e.yaml b/test/e2e-v2/cases/php/e2e.yaml
index a5c702600b491180664304d0cad83901e9ebdac7..463909ba24f0de3971a2765fe0c1965f159d8faf 100644
--- a/test/e2e-v2/cases/php/e2e.yaml
+++ b/test/e2e-v2/cases/php/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/profile/es/e2e.yaml b/test/e2e-v2/cases/profile/es/e2e.yaml
index 4f25875b673d76a5a582746e10eebc2d6bd0587f..107ef28d6e7a0b2e6e50665503534353be7aaf4e 100644
--- a/test/e2e-v2/cases/profile/es/e2e.yaml
+++ b/test/e2e-v2/cases/profile/es/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/profile/h2/e2e.yaml b/test/e2e-v2/cases/profile/h2/e2e.yaml
index 4f25875b673d76a5a582746e10eebc2d6bd0587f..107ef28d6e7a0b2e6e50665503534353be7aaf4e 100644
--- a/test/e2e-v2/cases/profile/h2/e2e.yaml
+++ b/test/e2e-v2/cases/profile/h2/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/profile/influxdb/e2e.yaml b/test/e2e-v2/cases/profile/influxdb/e2e.yaml
index 4f25875b673d76a5a582746e10eebc2d6bd0587f..107ef28d6e7a0b2e6e50665503534353be7aaf4e 100644
--- a/test/e2e-v2/cases/profile/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/profile/influxdb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/profile/mysql/docker-compose.yml b/test/e2e-v2/cases/profile/mysql/docker-compose.yml
index 8d0b1762682499f14eeae7c715980ea4aa6107c8..ac4137ad19920507b81d59ff12be7346206b0720 100644
--- a/test/e2e-v2/cases/profile/mysql/docker-compose.yml
+++ b/test/e2e-v2/cases/profile/mysql/docker-compose.yml
@@ -51,7 +51,7 @@ services:
     depends_on:
       mysql:
         condition: service_healthy
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     ports:
     - 12800
 
diff --git a/test/e2e-v2/cases/profile/mysql/e2e.yaml b/test/e2e-v2/cases/profile/mysql/e2e.yaml
index 4f25875b673d76a5a582746e10eebc2d6bd0587f..107ef28d6e7a0b2e6e50665503534353be7aaf4e 100644
--- a/test/e2e-v2/cases/profile/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/profile/mysql/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/python/e2e.yaml b/test/e2e-v2/cases/python/e2e.yaml
index ef193dc4f8837b01d0398c4959ffdf3f494e542a..01ec811648432475ea4856764b657e6a38840ddd 100644
--- a/test/e2e-v2/cases/python/e2e.yaml
+++ b/test/e2e-v2/cases/python/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml b/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
index c245b73cc78a8056b7ee3636b37782b2915ad291..20a7afde8a3d9cd55abb37864f268c1f741a0ef7 100644
--- a/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
+++ b/test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/simple/auth/e2e.yaml b/test/e2e-v2/cases/simple/auth/e2e.yaml
index eb4b2657b5555cf59b0431ce51abbf78261d4fec..e07a456452cba7a6ba638f47b0e9c9e49d52c8fa 100644
--- a/test/e2e-v2/cases/simple/auth/e2e.yaml
+++ b/test/e2e-v2/cases/simple/auth/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/simple/jdk/e2e.yaml b/test/e2e-v2/cases/simple/jdk/e2e.yaml
index eb4b2657b5555cf59b0431ce51abbf78261d4fec..e07a456452cba7a6ba638f47b0e9c9e49d52c8fa 100644
--- a/test/e2e-v2/cases/simple/jdk/e2e.yaml
+++ b/test/e2e-v2/cases/simple/jdk/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/simple/mtls/e2e.yaml b/test/e2e-v2/cases/simple/mtls/e2e.yaml
index eb4b2657b5555cf59b0431ce51abbf78261d4fec..e07a456452cba7a6ba638f47b0e9c9e49d52c8fa 100644
--- a/test/e2e-v2/cases/simple/mtls/e2e.yaml
+++ b/test/e2e-v2/cases/simple/mtls/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/simple/ssl/e2e.yaml b/test/e2e-v2/cases/simple/ssl/e2e.yaml
index eb4b2657b5555cf59b0431ce51abbf78261d4fec..e07a456452cba7a6ba638f47b0e9c9e49d52c8fa 100644
--- a/test/e2e-v2/cases/simple/ssl/e2e.yaml
+++ b/test/e2e-v2/cases/simple/ssl/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/so11y/e2e.yaml b/test/e2e-v2/cases/so11y/e2e.yaml
index 5d3b93e587e73c06eadfece055b8531f51e55141..6adde1cd92d35bf64b6b277c1f7932d495a8f7ba 100644
--- a/test/e2e-v2/cases/so11y/e2e.yaml
+++ b/test/e2e-v2/cases/so11y/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/storage/es/e2e.yaml b/test/e2e-v2/cases/storage/es/e2e.yaml
index c86d27e8c384200ea9e65b7a3afa93c47e3929ca..73f746c6e60c83b368b5487f57a1527b49193e61 100644
--- a/test/e2e-v2/cases/storage/es/e2e.yaml
+++ b/test/e2e-v2/cases/storage/es/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/storage/h2/e2e.yaml b/test/e2e-v2/cases/storage/h2/e2e.yaml
index c86d27e8c384200ea9e65b7a3afa93c47e3929ca..73f746c6e60c83b368b5487f57a1527b49193e61 100644
--- a/test/e2e-v2/cases/storage/h2/e2e.yaml
+++ b/test/e2e-v2/cases/storage/h2/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/storage/influxdb/e2e.yaml b/test/e2e-v2/cases/storage/influxdb/e2e.yaml
index c86d27e8c384200ea9e65b7a3afa93c47e3929ca..73f746c6e60c83b368b5487f57a1527b49193e61 100644
--- a/test/e2e-v2/cases/storage/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/storage/influxdb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/storage/mysql/docker-compose.yml b/test/e2e-v2/cases/storage/mysql/docker-compose.yml
index 075c0eecfd55229c6e2db1b0c7670099f3539469..7da822d8343dd722311d0658d2592d7777fdf9c2 100644
--- a/test/e2e-v2/cases/storage/mysql/docker-compose.yml
+++ b/test/e2e-v2/cases/storage/mysql/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest
     ports:
       - 12800
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     networks:
       - e2e
     depends_on:
diff --git a/test/e2e-v2/cases/storage/mysql/e2e.yaml b/test/e2e-v2/cases/storage/mysql/e2e.yaml
index c86d27e8c384200ea9e65b7a3afa93c47e3929ca..73f746c6e60c83b368b5487f57a1527b49193e61 100644
--- a/test/e2e-v2/cases/storage/mysql/e2e.yaml
+++ b/test/e2e-v2/cases/storage/mysql/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/storage/opensearch/e2e.yaml b/test/e2e-v2/cases/storage/opensearch/e2e.yaml
index c86d27e8c384200ea9e65b7a3afa93c47e3929ca..73f746c6e60c83b368b5487f57a1527b49193e61 100644
--- a/test/e2e-v2/cases/storage/opensearch/e2e.yaml
+++ b/test/e2e-v2/cases/storage/opensearch/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/storage/postgres/e2e.yaml b/test/e2e-v2/cases/storage/postgres/e2e.yaml
index c86d27e8c384200ea9e65b7a3afa93c47e3929ca..73f746c6e60c83b368b5487f57a1527b49193e61 100644
--- a/test/e2e-v2/cases/storage/postgres/e2e.yaml
+++ b/test/e2e-v2/cases/storage/postgres/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/storage/tidb/docker-compose.yml b/test/e2e-v2/cases/storage/tidb/docker-compose.yml
index 926543a36a69fabcbe6f29a325e3d885a717ce40..33c9d449757c485c9b0e849ff08995c90006f59b 100644
--- a/test/e2e-v2/cases/storage/tidb/docker-compose.yml
+++ b/test/e2e-v2/cases/storage/tidb/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       SW_DATA_SOURCE_PASSWORD: ""
     ports:
       - 12800
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     networks:
       - e2e
     depends_on:
diff --git a/test/e2e-v2/cases/storage/tidb/e2e.yaml b/test/e2e-v2/cases/storage/tidb/e2e.yaml
index c86d27e8c384200ea9e65b7a3afa93c47e3929ca..73f746c6e60c83b368b5487f57a1527b49193e61 100644
--- a/test/e2e-v2/cases/storage/tidb/e2e.yaml
+++ b/test/e2e-v2/cases/storage/tidb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/ttl/es/e2e.yaml b/test/e2e-v2/cases/ttl/es/e2e.yaml
index 424cdd6b4051f9b432018700199b592cec38c2de..3793093ccad39e87d9f9bfcb540ac7266ae9df29 100644
--- a/test/e2e-v2/cases/ttl/es/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/es/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/ttl/influxdb/e2e.yaml b/test/e2e-v2/cases/ttl/influxdb/e2e.yaml
index 424cdd6b4051f9b432018700199b592cec38c2de..3793093ccad39e87d9f9bfcb540ac7266ae9df29 100644
--- a/test/e2e-v2/cases/ttl/influxdb/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/influxdb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/ttl/postgresql/e2e.yaml b/test/e2e-v2/cases/ttl/postgresql/e2e.yaml
index 424cdd6b4051f9b432018700199b592cec38c2de..3793093ccad39e87d9f9bfcb540ac7266ae9df29 100644
--- a/test/e2e-v2/cases/ttl/postgresql/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/postgresql/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/ttl/tidb/docker-compose.yml b/test/e2e-v2/cases/ttl/tidb/docker-compose.yml
index d9bea25b6af9a4dfafc22df5ad0db2522b7f0599..344cd0270ba4765b3989a9bc83f6ea5168e046b0 100644
--- a/test/e2e-v2/cases/ttl/tidb/docker-compose.yml
+++ b/test/e2e-v2/cases/ttl/tidb/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       SW_CORE_METRICS_DATA_TTL: 7
       SW_JDBC_URL: "jdbc:mysql://tidb:4000/test"
       SW_DATA_SOURCE_PASSWORD: ""
-    entrypoint: ['sh', '-c', 'apk add --no-cache bash && /download-mysql.sh && /skywalking/docker-entrypoint.sh']
+    entrypoint: ['sh', '-c', '/download-mysql.sh && /skywalking/docker-entrypoint.sh']
     depends_on:
       tidb:
         condition: service_healthy
diff --git a/test/e2e-v2/cases/ttl/tidb/e2e.yaml b/test/e2e-v2/cases/ttl/tidb/e2e.yaml
index 424cdd6b4051f9b432018700199b592cec38c2de..3793093ccad39e87d9f9bfcb540ac7266ae9df29 100644
--- a/test/e2e-v2/cases/ttl/tidb/e2e.yaml
+++ b/test/e2e-v2/cases/ttl/tidb/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml b/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
index 3288d67c9283ed7eedeb37d62738e0b8e551e59f..2bb50d1de1e3bd09b5621eef8be3f3641073f07c 100644
--- a/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
+++ b/test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/cases/vm/zabbix/e2e.yaml b/test/e2e-v2/cases/vm/zabbix/e2e.yaml
index 96cd7946dcd1564e43d7036c0d226c80d83043c9..3c031ae273af2d8feb98071fb856ce8a27dbaca8 100644
--- a/test/e2e-v2/cases/vm/zabbix/e2e.yaml
+++ b/test/e2e-v2/cases/vm/zabbix/e2e.yaml
@@ -18,7 +18,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
   init-system-environment: ../../../script/env
   steps:
     - name: install yq
diff --git a/test/e2e-v2/script/docker-compose/base-compose.yml b/test/e2e-v2/script/docker-compose/base-compose.yml
index 39db0b0908f8b5763cf9a449a45b820553feca5c..26e6cccee42b1a4a60521ed7d3076f5299c737d8 100644
--- a/test/e2e-v2/script/docker-compose/base-compose.yml
+++ b/test/e2e-v2/script/docker-compose/base-compose.yml
@@ -37,7 +37,7 @@ services:
       SW_CONFIG_ETCD_ENDPOINTS: http://etcd:2379
       SW_CLUSTER_ETCD_ENDPOINTS: http://etcd:2379
     healthcheck:
-      test: ["CMD", "sh", "-c", "nc -zn 127.0.0.1 11800"]
+      test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"]
       interval: 5s
       timeout: 60s
       retries: 120
diff --git a/test/e2e-v2/script/prepare/setup-oap/download-mysql.sh b/test/e2e-v2/script/prepare/setup-oap/download-mysql.sh
index 3d5c87d15e633f5886976893b9522ee2a1d14bc6..c98ab5036d67ce29ec985c9f9a54b3b6a62f3ee1 100755
--- a/test/e2e-v2/script/prepare/setup-oap/download-mysql.sh
+++ b/test/e2e-v2/script/prepare/setup-oap/download-mysql.sh
@@ -17,8 +17,6 @@
 
 set -ex
 
-apk add curl
-
 SW_HOME=/skywalking
 MYSQL_URL="https://repo.maven.apache.org/maven2/mysql/mysql-connector-java/8.0.13/mysql-connector-java-8.0.13.jar"
 MYSQL_DRIVER="mysql-connector-java-8.0.13.jar"