diff --git a/Jenkinsfile b/Jenkinsfile
index c31c1442..13d70962 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -411,7 +411,7 @@ pipeline {
                     sh """
                         echo "📊 Service Status:"
                         ${servicesToCheck.collect {
-                            def container = getContainerNameForService(it)
+                            def container = getContainerNameForService(it, env.CONTAINER_NAME_SUFFIX)
                             "docker inspect --format='${it}: {{.State.Status}} ({{.State.Health.Status}})' ${container} 2>/dev/null || echo '${it}: not found'"
                         }.join('\n                        ')}
                     """
@@ -767,11 +767,15 @@ def backupCurrentDeployment(def services) {
             ssh ${sshOpts} root@${env.DEPLOY_HOST} '
                 cd ${env.DEPLOY_PATH}
                 
-                # 保存当前 docker-compose 配置
-                cp docker-compose.core.yml docker-compose.core.yml.backup-${env.BUILD_NUMBER}
-                
-                # 记录当前运行的镜像
-                docker compose -f ${env.COMPOSE_FILE} images > deployment-state-${env.BUILD_NUMBER}.txt
+                # 保存当前 docker-compose 配置（用 ${env.COMPOSE_FILE} 适配多环境，文件不存在则跳过）
+                if [ -f ${env.COMPOSE_FILE} ]; then
+                    cp ${env.COMPOSE_FILE} ${env.COMPOSE_FILE}.backup-${env.BUILD_NUMBER}
+                fi
+
+                # 记录当前运行的镜像（compose 文件不存在时跳过）
+                if [ -f ${env.COMPOSE_FILE} ]; then
+                    docker compose -f ${env.COMPOSE_FILE} images > deployment-state-${env.BUILD_NUMBER}.txt
+                fi
                 
                 echo "✅ Backup completed: deployment-state-${env.BUILD_NUMBER}.txt"
             '
@@ -927,7 +931,7 @@ def deployServiceWithTimeout(String service) {
 
 // 部署单个服务
 def deployService(String service) {
-    def containerName = getContainerNameForService(service)
+    def containerName = getContainerNameForService(service, env.CONTAINER_NAME_SUFFIX)
     def sshOpts = "-o StrictHostKeyChecking=no -o ConnectTimeout=10 -i ${env.SSH_KEY}"
 
     echo ""
@@ -945,7 +949,11 @@ def deployService(String service) {
                 set -e
                 cd ${env.DEPLOY_PATH}
 
-                echo "📥 Pulling ${service}..."
+                # 关键：注入本次构建的镜像 tag，否则 docker compose 会 fallback 到 yml 的 :latest（拉到 prod 镜像）
+                export IMAGE_TAG=${env.IMAGE_TAG}
+                export REGISTRY_HOST=${env.REGISTRY}
+
+                echo "📥 Pulling ${service} (tag=${env.IMAGE_TAG})..."
                 docker compose -f ${env.COMPOSE_FILE} pull ${service}
 
                 echo "🔄 Restarting ${service}..."
@@ -1049,7 +1057,7 @@ def waitForServiceHealthy(String containerName, String serviceName, String sshOp
 
 // 检查服务健康（带重试）
 def checkServiceHealthWithRetry(String service) {
-    def containerName = getContainerNameForService(service)
+    def containerName = getContainerNameForService(service, env.CONTAINER_NAME_SUFFIX)
     def sshOpts = "-o StrictHostKeyChecking=no -o ConnectTimeout=10 -i ${env.SSH_KEY}"
 
     retry(3) {
@@ -1117,11 +1125,9 @@ def sortServicesByDependency(def services) {
     }
 }
 
-// 获取服务对应的容器名称
+// 获取服务对应的容器名称（suffix 由调用者传入，避免 NonCPS 函数依赖 env binding）
 @NonCPS
-def getContainerNameForService(String service) {
-    // 容器名 suffix 在 Initialize 阶段按分支决定（release/next='-release'、master=''），
-    // 物理隔离防止 release 部署误伤 prod 同名容器
+def getContainerNameForService(String service, String suffix) {
     def map = [
         'viewsh-gateway': 'aiot-gateway',
         'viewsh-module-system-server': 'aiot-system-server',
@@ -1130,7 +1136,7 @@ def getContainerNameForService(String service) {
         'viewsh-module-iot-gateway': 'aiot-iot-gateway',
         'viewsh-module-ops-server': 'aiot-ops-server'
     ]
-    return map.get(service, "aiot-${service}") + (env.CONTAINER_NAME_SUFFIX ?: '')
+    return map.get(service, "aiot-${service}") + (suffix ?: '')
 }
 
 // 获取服务对应的模块路径