diff --git a/release/latest/compose.yaml b/release/latest/compose.yaml
index a50efd9..48e6f9e 100644
--- a/release/latest/compose.yaml
+++ b/release/latest/compose.yaml
@@ -25,6 +25,8 @@ services:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.2
     command: [postgres, -c, max_connections=200]
+    healthcheck:
+      test: pg_isready -U safeline-ce -d safeline-ce
   mgt:
     container_name: safeline-mgt
     restart: always
diff --git a/release/latest/setup.sh b/release/latest/setup.sh
index 17273b2..75a4ef2 100755
--- a/release/latest/setup.sh
+++ b/release/latest/setup.sh
@@ -250,6 +250,7 @@ fi
 
 qrcode
 
+check_container_health safeline-pg
 check_container_health safeline-mgt
 docker exec safeline-mgt /app/mgt-cli reset-admin --once
 
diff --git a/release/latest/upgrade.sh b/release/latest/upgrade.sh
index c31e7e5..3c72deb 100755
--- a/release/latest/upgrade.sh
+++ b/release/latest/upgrade.sh
@@ -268,12 +268,14 @@ $compose_command down --remove-orphans && $compose_command up -d
 if [ $? -ne "0" ]; then
     abort "替换 Docker 容器失败"
 fi
-info "雷池升级成功"
 
 qrcode
 
+check_container_health safeline-pg
 check_container_health safeline-mgt
 docker exec safeline-mgt /app/mgt-cli reset-admin --once
 
+info "雷池升级成功"
+
 warning "雷池 WAF 社区版安装成功, 请访问以下地址访问控制台"
 warning "https://0.0.0.0:9443/"