diff --git a/.github/workflows/buidl_and_push_ghcr.yml b/.github/workflows/buidl_and_push_ghcr.yml
index 4717b6c..2491080 100644
--- a/.github/workflows/buidl_and_push_ghcr.yml
+++ b/.github/workflows/buidl_and_push_ghcr.yml
@@ -13,9 +13,22 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Wait for and verify Docker-in-Docker (DIND) connection
+      run: |
+        echo "Waiting for Docker daemon to be ready..."
+        while ! docker info > /dev/null 2>&1; do
+          echo -n "."
+          sleep 1
+        done
+        echo "\nDocker daemon is ready!"
+        docker info
+
     # 设置 Docker Buildx
+    # 使用 driver: docker 以复用现有的 Docker 守护进程，避免在 Rootless 环境下挂载 socket 失败
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
+      with:
+        driver: docker
 
     # 登录 Gitea 容器镜像库
     - name: Log in to Gitea Container Registry