diff --git a/.github/services/azblob/azurite_azblob/action.yml b/.github/services/azblob/azurite_azblob/action.yml
index b5e255c02519..9a084231f966 100644
--- a/.github/services/azblob/azurite_azblob/action.yml
+++ b/.github/services/azblob/azurite_azblob/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup azurite azblob service
       shell: bash
       working-directory: fixtures/azblob
-      run: docker compose -f docker-compose-azurite.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-azurite.yml up -d --wait
     - name: Setup test bucket
       shell: bash
       run: |
diff --git a/.github/services/etcd/etcd-cluster/action.yml b/.github/services/etcd/etcd-cluster/action.yml
index 0a1e68ea70fd..8b8d8acd9a5c 100644
--- a/.github/services/etcd/etcd-cluster/action.yml
+++ b/.github/services/etcd/etcd-cluster/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup etcd cluster
       shell: bash
       working-directory: fixtures/etcd
-      run: docker compose -f docker-compose-cluster.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-cluster.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/etcd/etcd-tls/action.yml b/.github/services/etcd/etcd-tls/action.yml
index c72b70d2cb62..ea6f494d50ed 100644
--- a/.github/services/etcd/etcd-tls/action.yml
+++ b/.github/services/etcd/etcd-tls/action.yml
@@ -30,7 +30,7 @@ runs:
     - name: Setup etcd tls
       shell: bash
       working-directory: fixtures/etcd
-      run: docker compose -f docker-compose-standalone-tls.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-standalone-tls.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/etcd/etcd/action.yml b/.github/services/etcd/etcd/action.yml
index 9f0a1eeb6f7a..2ee78ea05fa3 100644
--- a/.github/services/etcd/etcd/action.yml
+++ b/.github/services/etcd/etcd/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup etcd cluster
       shell: bash
       working-directory: fixtures/etcd
-      run: docker compose -f docker-compose-standalone.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-standalone.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/http/caddy/action.yml b/.github/services/http/caddy/action.yml
index 374d6e7c9fee..76244e2407ce 100644
--- a/.github/services/http/caddy/action.yml
+++ b/.github/services/http/caddy/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup http in caddy
       shell: bash
       working-directory: fixtures/http
-      run: docker compose -f docker-compose-caddy.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-caddy.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/http/nginx/action.yml b/.github/services/http/nginx/action.yml
index de95c361135f..e717fbb81c8c 100644
--- a/.github/services/http/nginx/action.yml
+++ b/.github/services/http/nginx/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup http in nginx
       shell: bash
       working-directory: fixtures/http
-      run: docker compose -f docker-compose-nginx.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-nginx.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/memcached/memcached/action.yml b/.github/services/memcached/memcached/action.yml
index c6c0ca457fb3..fa7b63786d73 100644
--- a/.github/services/memcached/memcached/action.yml
+++ b/.github/services/memcached/memcached/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup memcached server
       shell: bash
       working-directory: fixtures/memcached
-      run: docker compose -f docker-compose-memcached.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-memcached.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/mongodb/mongodb_with_basic_auth/action.yml b/.github/services/mongodb/mongodb_with_basic_auth/action.yml
index 17cd742043f0..797dcadb8021 100644
--- a/.github/services/mongodb/mongodb_with_basic_auth/action.yml
+++ b/.github/services/mongodb/mongodb_with_basic_auth/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup MongoDB Server
       shell: bash
       working-directory: fixtures/mongodb
-      run: docker compose -f docker-compose-basic-auth.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-basic-auth.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/mongodb/mongodb_with_no_auth/action.yml b/.github/services/mongodb/mongodb_with_no_auth/action.yml
index 4f197b655f74..206bdab3496f 100644
--- a/.github/services/mongodb/mongodb_with_no_auth/action.yml
+++ b/.github/services/mongodb/mongodb_with_no_auth/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup MongoDB Server
       shell: bash
       working-directory: fixtures/mongodb
-      run: docker compose -f docker-compose-no-auth.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-no-auth.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/mysql/mysql/action.yml b/.github/services/mysql/mysql/action.yml
index f8eb9d250a2b..5844b6598aea 100644
--- a/.github/services/mysql/mysql/action.yml
+++ b/.github/services/mysql/mysql/action.yml
@@ -26,7 +26,7 @@ runs:
       working-directory: fixtures/mysql
       run: |
         apt update && apt install -y mysql-client
-        docker compose -f docker-compose.yml up -d --wait --wait-timeout 20
+        docker compose -f docker-compose.yml up -d --wait
         while ! mysql -h localhost -P 3306 --protocol=tcp -u root -p'password' -e "SELECT 1"; do
             echo "Waiting for MySQL..."
             sleep 1
diff --git a/.github/services/postgresql/postgresql/action.yml b/.github/services/postgresql/postgresql/action.yml
index 527b43ec79df..19fcf455b9ca 100644
--- a/.github/services/postgresql/postgresql/action.yml
+++ b/.github/services/postgresql/postgresql/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup PostgreSQL Server
       shell: bash
       working-directory: fixtures/postgresql
-      run: docker compose -f docker-compose.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/redis/dragonfly/action.yml b/.github/services/redis/dragonfly/action.yml
index f6ef0ad9a7d5..a462093fe008 100644
--- a/.github/services/redis/dragonfly/action.yml
+++ b/.github/services/redis/dragonfly/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup Dragonfly Server
       shell: bash
       working-directory: fixtures/redis
-      run: docker compose -f docker-compose-dragonfly.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-dragonfly.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/redis/kvrocks/action.yml b/.github/services/redis/kvrocks/action.yml
index ab8d01d68d00..fd28cb9bb542 100644
--- a/.github/services/redis/kvrocks/action.yml
+++ b/.github/services/redis/kvrocks/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup Kvrocks Server
       shell: bash
       working-directory: fixtures/redis
-      run: docker compose -f docker-compose-kvrocks.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-kvrocks.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/redis/redis/action.yml b/.github/services/redis/redis/action.yml
index b7198cd6ad63..443f4684a4e2 100644
--- a/.github/services/redis/redis/action.yml
+++ b/.github/services/redis/redis/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup Redis Server
       shell: bash
       working-directory: fixtures/redis
-      run: docker compose -f docker-compose-redis.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-redis.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/redis/redis_with_cluster/action.yml b/.github/services/redis/redis_with_cluster/action.yml
index 7fd453b92a89..bf6d1940f7ea 100644
--- a/.github/services/redis/redis_with_cluster/action.yml
+++ b/.github/services/redis/redis_with_cluster/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup Redis Cluster
       shell: bash
       working-directory: fixtures/redis
-      run: docker compose -f docker-compose-redis-cluster.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-redis-cluster.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/s3/minio_s3/action.yml b/.github/services/s3/minio_s3/action.yml
index f9414aeee2b2..1be2e5a7d052 100644
--- a/.github/services/s3/minio_s3/action.yml
+++ b/.github/services/s3/minio_s3/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Setup MinIO Server
       shell: bash
       working-directory: fixtures/s3
-      run: docker compose -f docker-compose-minio.yml up -d --wait --wait-timeout 20
+      run: docker compose -f docker-compose-minio.yml up -d --wait
     - name: Setup test bucket
       shell: bash
       env:
diff --git a/.github/services/s3/minio_s3_with_anonymous/action.yml b/.github/services/s3/minio_s3_with_anonymous/action.yml
index 3c6093baea31..e49390b44667 100644
--- a/.github/services/s3/minio_s3_with_anonymous/action.yml
+++ b/.github/services/s3/minio_s3_with_anonymous/action.yml
@@ -25,7 +25,7 @@ runs:
       shell: bash
       working-directory: fixtures/s3
       run: |
-        docker compose -f docker-compose-minio.yml up -d --wait --wait-timeout 20
+        docker compose -f docker-compose-minio.yml up -d --wait
     - name: Setup test bucket
       shell: bash
       env:
diff --git a/.github/services/sftp/sftp/action.yml b/.github/services/sftp/sftp/action.yml
index cc529269b17d..c3586ca3ab0d 100644
--- a/.github/services/sftp/sftp/action.yml
+++ b/.github/services/sftp/sftp/action.yml
@@ -25,7 +25,7 @@ runs:
       shell: bash
       working-directory: fixtures/sftp
       run: |
-        docker compose -f docker-compose-sftp.yml up -d --wait --wait-timeout 20
+        docker compose -f docker-compose-sftp.yml up -d --wait
     - name: Setup
       shell: bash
       run: |
diff --git a/.github/services/sftp/sftp_with_default_root/action.yml b/.github/services/sftp/sftp_with_default_root/action.yml
index ec538c95385a..0030ed52de10 100644
--- a/.github/services/sftp/sftp_with_default_root/action.yml
+++ b/.github/services/sftp/sftp_with_default_root/action.yml
@@ -25,7 +25,7 @@ runs:
       shell: bash
       working-directory: fixtures/sftp
       run: |
-        docker compose -f docker-compose-sftp-with-default-root.yml up -d --wait --wait-timeout 20
+        docker compose -f docker-compose-sftp-with-default-root.yml up -d --wait
     - name: Setup
       shell: bash
       run: |