diff --git a/other/nightly/upgrade.sh b/other/nightly/upgrade.sh
index aa0c82865..ba21c82ff 100644
--- a/other/nightly/upgrade.sh
+++ b/other/nightly/upgrade.sh
@@ -77,8 +77,9 @@ echo "All images pulled successfully." >>"$LOGFILE"
 
 # Stop and remove existing Coolify containers to prevent conflicts
 # This handles both old installations (project "source") and new ones (project "coolify")
+# Stop coolify last to allow upgrade process to complete gracefully
 echo "Stopping existing Coolify containers..." >>"$LOGFILE"
-for container in coolify coolify-db coolify-redis coolify-realtime; do
+for container in coolify-db coolify-redis coolify-realtime coolify; do
     if docker ps -a --format '{{.Names}}' | grep -q "^${container}$"; then
         docker stop "$container" >>"$LOGFILE" 2>&1 || true
         docker rm "$container" >>"$LOGFILE" 2>&1 || true
diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index f922983c6..204240bb6 100644
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -175,7 +175,8 @@ echo "     All images pulled successfully."
 log_section "Step 4/6: Stopping existing containers"
 echo ""
 echo "4/6 Stopping existing containers..."
-for container in coolify coolify-db coolify-redis coolify-realtime; do
+# Stop coolify last to allow upgrade process to complete gracefully
+for container in coolify-db coolify-redis coolify-realtime coolify; do
     if docker ps -a --format '{{.Names}}' | grep -q "^${container}$"; then
         echo "     - Stopping ${container}..."
         log "Stopping container: ${container}"