diff --git a/.drone.yml b/.drone.yml
index b74e0c4..967df90 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,34 +12,55 @@ trigger:
 steps:
   # 构建并推送后端镜像
   - name: build-push-backend
-    image: plugins/docker
-    settings:
-      registry:
+    image: docker:dind
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_REGISTRY:
         from_secret: docker_registry
-      username:
+      DOCKER_USERNAME:
         from_secret: docker_username
-      password:
+      DOCKER_PASSWORD:
         from_secret: docker_password
-      repo: crpi-na6dit5kd0bonqed.cn-guangzhou.personal.cr.aliyuncs.com/ireborn/ai-interview-backend
-      dockerfile: deploy/Dockerfile.backend
-      tags:
-        - latest
-        - ${DRONE_BRANCH}
-        - ${DRONE_COMMIT_SHA:0:8}
+    commands:
+      - echo "登录 ACR..."
+      - echo "$DOCKER_PASSWORD" | docker login "$DOCKER_REGISTRY" -u "$DOCKER_USERNAME" --password-stdin
+      - echo "构建后端镜像..."
+      - docker build -t $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH} -f deploy/Dockerfile.backend .
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-backend:latest
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_COMMIT_SHA:0:8}
+      - echo "推送后端镜像..."
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_BRANCH}
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-backend:latest
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-backend:${DRONE_COMMIT_SHA:0:8}
 
   # 构建并推送前端镜像
   - name: build-push-frontend
-    image: plugins/docker
-    settings:
-      registry:
+    image: docker:dind
+    volumes:
+      - name: docker-sock
+        path: /var/run/docker.sock
+    environment:
+      DOCKER_REGISTRY:
         from_secret: docker_registry
-      username:
+      DOCKER_USERNAME:
         from_secret: docker_username
-      password:
+      DOCKER_PASSWORD:
         from_secret: docker_password
-      repo: crpi-na6dit5kd0bonqed.cn-guangzhou.personal.cr.aliyuncs.com/ireborn/ai-interview-frontend
-      dockerfile: deploy/Dockerfile.frontend
-      tags:
-        - latest
-        - ${DRONE_BRANCH}
-        - ${DRONE_COMMIT_SHA:0:8}
+    commands:
+      - echo "登录 ACR..."
+      - echo "$DOCKER_PASSWORD" | docker login "$DOCKER_REGISTRY" -u "$DOCKER_USERNAME" --password-stdin
+      - echo "构建前端镜像..."
+      - docker build -t $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH} -f deploy/Dockerfile.frontend .
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-frontend:latest
+      - docker tag $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH} $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_COMMIT_SHA:0:8}
+      - echo "推送前端镜像..."
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_BRANCH}
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-frontend:latest
+      - docker push $DOCKER_REGISTRY/ireborn/ai-interview-frontend:${DRONE_COMMIT_SHA:0:8}
+
+volumes:
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock