diff --git a/.replit b/.replit
index 048618b..597ad14 100644
--- a/.replit
+++ b/.replit
@@ -19,6 +19,10 @@ externalPort = 80
 localPort = 33035
 externalPort = 3001
 
+[[ports]]
+localPort = 36403
+externalPort = 3003
+
 [[ports]]
 localPort = 41343
 externalPort = 3000
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index 81eeab6..253c0d7 100644
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -26,21 +26,26 @@ BACKUP_FILE="$BACKUP_DIR/backup_$(date +%Y%m%d_%H%M%S).sql"
 
 # Load env vars
 if [ -f .env ]; then
-    export $(cat .env | grep -v '^#' | xargs)
+    source .env
 fi
 
 # Esegui backup PostgreSQL
 if command -v pg_dump &> /dev/null; then
-    PGPASSWORD=$PGPASSWORD pg_dump -h $PGHOST -U $PGUSER -d $PGDATABASE > $BACKUP_FILE
-    echo "✅ Backup salvato: $BACKUP_FILE"
-    
-    # Comprimi backup
-    gzip $BACKUP_FILE
-    echo "✅ Backup compresso: ${BACKUP_FILE}.gz"
-    
-    # Pulisci backup vecchi (> 30 giorni)
-    find $BACKUP_DIR -name "backup_*.sql.gz" -mtime +30 -delete
-    echo "🧹 Backup vecchi eliminati (retention: 30 giorni)"
+    # Controlla che le variabili siano definite
+    if [ -z "$PGDATABASE" ] || [ -z "$PGUSER" ]; then
+        echo "⚠️  Variabili DB non trovate nel .env, skip backup"
+    else
+        PGPASSWORD=$PGPASSWORD pg_dump -h ${PGHOST:-localhost} -U $PGUSER --dbname=$PGDATABASE > $BACKUP_FILE
+        echo "✅ Backup salvato: $BACKUP_FILE"
+        
+        # Comprimi backup
+        gzip $BACKUP_FILE
+        echo "✅ Backup compresso: ${BACKUP_FILE}.gz"
+        
+        # Pulisci backup vecchi (> 30 giorni)
+        find $BACKUP_DIR -name "backup_*.sql.gz" -mtime +30 -delete
+        echo "🧹 Backup vecchi eliminati (retention: 30 giorni)"
+    fi
 else
     echo "⚠️  pg_dump non trovato, skip backup"
 fi
@@ -88,7 +93,7 @@ else
     LATEST_BACKUP=$(ls -t $BACKUP_DIR/backup_*.sql.gz 2>/dev/null | head -1)
     if [ -f "$LATEST_BACKUP" ]; then
         echo "📦 Ripristino da: $LATEST_BACKUP"
-        gunzip -c $LATEST_BACKUP | PGPASSWORD=$PGPASSWORD psql -h $PGHOST -U $PGUSER -d $PGDATABASE
+        gunzip -c $LATEST_BACKUP | PGPASSWORD=$PGPASSWORD psql -h ${PGHOST:-localhost} -U $PGUSER --dbname=$PGDATABASE
         echo "✅ Database ripristinato"
     fi