diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index a6e4e79..ca44eba 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -50,15 +50,14 @@ jobs:
           export TEST_JWT_SECRET="${{ secrets.TEST_JWT_SECRET }}"
           export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
 
-          # 使用 docker compose（V2 版本，空格分隔）
-          docker compose -f docker-compose.test.yml down --remove-orphans || docker-compose -f docker-compose.test.yml down --remove-orphans
-          docker compose -f docker-compose.test.yml build --parallel || docker-compose -f docker-compose.test.yml build --parallel
-          docker compose -f docker-compose.test.yml up -d || docker-compose -f docker-compose.test.yml up -d
+          docker compose -f docker-compose.test.yml down --remove-orphans
+          docker compose -f docker-compose.test.yml build --parallel
+          docker compose -f docker-compose.test.yml up -d
           docker image prune -f
 
           echo "等待服务启动..."
           sleep 10
-          docker compose -f docker-compose.test.yml ps || docker-compose -f docker-compose.test.yml ps
+          docker compose -f docker-compose.test.yml ps
           echo "✅ 测试环境部署完成"
 
       - name: Deploy to production
@@ -71,13 +70,12 @@ jobs:
           export PROD_JWT_SECRET="${{ secrets.PROD_JWT_SECRET }}"
           export ENCRYPTION_KEY="${{ secrets.ENCRYPTION_KEY }}"
 
-          # 使用 docker compose（V2 版本，空格分隔）
-          docker compose -f docker-compose.prod.yml down --remove-orphans || docker-compose -f docker-compose.prod.yml down --remove-orphans
-          docker compose -f docker-compose.prod.yml build --parallel || docker-compose -f docker-compose.prod.yml build --parallel
-          docker compose -f docker-compose.prod.yml up -d || docker-compose -f docker-compose.prod.yml up -d
+          docker compose -f docker-compose.prod.yml down --remove-orphans
+          docker compose -f docker-compose.prod.yml build --parallel
+          docker compose -f docker-compose.prod.yml up -d
           docker image prune -f
 
           echo "等待服务启动..."
           sleep 10
-          docker compose -f docker-compose.prod.yml ps || docker-compose -f docker-compose.prod.yml ps
+          docker compose -f docker-compose.prod.yml ps
           echo "✅ 生产环境部署完成"
diff --git a/deploy/docker/Dockerfile.merchant b/deploy/docker/Dockerfile.merchant
index a9c1449..a4c1d96 100644
--- a/deploy/docker/Dockerfile.merchant
+++ b/deploy/docker/Dockerfile.merchant
@@ -4,7 +4,7 @@ WORKDIR /app
 COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
 COPY packages/ ./packages/
 COPY apps/merchant-admin/ ./apps/merchant-admin/
-RUN npm install -g pnpm && pnpm install --frozen-lockfile
+RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
 RUN pnpm --filter @rent/shared-types build
 RUN pnpm --filter @rent/shared-utils build
 RUN cd apps/merchant-admin && pnpm run build
diff --git a/deploy/docker/Dockerfile.platform b/deploy/docker/Dockerfile.platform
index cf19f29..e3ebb54 100644
--- a/deploy/docker/Dockerfile.platform
+++ b/deploy/docker/Dockerfile.platform
@@ -4,7 +4,7 @@ WORKDIR /app
 COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
 COPY packages/ ./packages/
 COPY apps/platform-admin/ ./apps/platform-admin/
-RUN npm install -g pnpm && pnpm install --frozen-lockfile
+RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
 RUN pnpm --filter @rent/shared-types build
 RUN pnpm --filter @rent/shared-utils build
 RUN cd apps/platform-admin && pnpm run build
diff --git a/deploy/docker/Dockerfile.server b/deploy/docker/Dockerfile.server
index 14b9359..f127fbe 100644
--- a/deploy/docker/Dockerfile.server
+++ b/deploy/docker/Dockerfile.server
@@ -4,7 +4,7 @@ WORKDIR /app
 COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
 COPY packages/ ./packages/
 COPY apps/server/ ./apps/server/
-RUN npm install -g pnpm && pnpm install --frozen-lockfile
+RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
 RUN cd apps/server && pnpm run build
 
 FROM node:18-alpine AS server
diff --git a/deploy/docker/Dockerfile.website b/deploy/docker/Dockerfile.website
index 2dda7b4..0c9431b 100644
--- a/deploy/docker/Dockerfile.website
+++ b/deploy/docker/Dockerfile.website
@@ -4,7 +4,7 @@ WORKDIR /app
 COPY pnpm-workspace.yaml pnpm-lock.yaml package.json ./
 COPY packages/ ./packages/
 COPY apps/official-website/ ./apps/official-website/
-RUN npm install -g pnpm && pnpm install --frozen-lockfile
+RUN npm install -g pnpm@8 && pnpm install --frozen-lockfile
 RUN cd apps/official-website && pnpm run build
 
 FROM nginx:alpine AS website