diff --git a/oracle/standby-server-scripts/cleanup_database.ps1 b/oracle/standby-server-scripts/cleanup_database.ps1
index 526fa13..3df7542 100644
--- a/oracle/standby-server-scripts/cleanup_database.ps1
+++ b/oracle/standby-server-scripts/cleanup_database.ps1
@@ -40,56 +40,50 @@ New-Item -ItemType Directory -Path "D:\oracle\temp" -Force | Out-Null
 New-Item -ItemType Directory -Path "D:\oracle\logs" -Force | Out-Null
 
 Write-Host ""
-if ($afterRestore) {
-    Write-Host "[1/6] Shutting down database (cleanup AFTER restore)..."
+Write-Host "[1/6] Shutting down database and stopping service..."
+
+# Check if Oracle service exists
+$service = Get-Service -Name "OracleServiceROA" -ErrorAction SilentlyContinue
+if ($service) {
+    Write-Host "    Oracle service found, ensuring clean shutdown..."
     
-    # Check if Oracle service exists
-    $service = Get-Service -Name "OracleServiceROA" -ErrorAction SilentlyContinue
-    if ($service) {
-        Write-Host "    Oracle service found, attempting shutdown..."
-        
-        # Shutdown instance using SQL*Plus
-        $shutdownSQL = "WHENEVER SQLERROR CONTINUE`nSHUTDOWN ABORT;`nEXIT;"
-        try {
-            $shutdownSQL | & sqlplus -S / as sysdba 2>&1 | Out-Null
-            Start-Sleep -Seconds 2
-            Write-Host "    Instance shut down"
-        } catch {
-            Write-Host "    Shutdown command sent (errors ignored)"
-        }
-        
-        # Stop Oracle service to release file locks
-        if ($service.Status -eq "Running") {
-            Write-Host "    Stopping Oracle service to release file locks..."
-            try {
-                Stop-Service -Name "OracleServiceROA" -Force -ErrorAction Stop
-                Start-Sleep -Seconds 2
-                Write-Host "    Service stopped"
-            } catch {
-                Write-Host "    WARNING: Failed to stop service: $_" -ForegroundColor Yellow
-            }
-        }
-        
-        # Force kill any remaining Oracle processes
-        Get-Process -Name "sqlplus" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-        Get-Process -Name "oracle" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
-    } else {
-        Write-Host "    Oracle service not found, skipping shutdown"
+    # Shutdown instance using SQL*Plus (always, not just /AFTER)
+    $shutdownSQL = "WHENEVER SQLERROR CONTINUE`nSHUTDOWN ABORT;`nEXIT;"
+    try {
+        $shutdownSQL | & sqlplus -S / as sysdba 2>&1 | Out-Null
+        Start-Sleep -Seconds 2
+        Write-Host "    Instance shut down (ABORT for fast cleanup)"
+    } catch {
+        Write-Host "    Shutdown command sent (errors ignored)"
     }
+    
+    # ALWAYS stop Oracle service to ensure clean state
+    if ($service.Status -eq "Running") {
+        Write-Host "    Stopping Oracle service to ensure clean state..."
+        try {
+            Stop-Service -Name "OracleServiceROA" -Force -ErrorAction Stop
+            Start-Sleep -Seconds 3
+            Write-Host "    Service stopped successfully"
+        } catch {
+            Write-Host "    WARNING: Failed to stop service: $_" -ForegroundColor Yellow
+        }
+    } else {
+        Write-Host "    Service already stopped"
+    }
+    
+    # Force kill any remaining Oracle processes to ensure clean state
+    Write-Host "    Cleaning up any remaining Oracle processes..."
+    Get-Process -Name "sqlplus" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
+    Get-Process -Name "oracle" -ErrorAction SilentlyContinue | Stop-Process -Force -ErrorAction SilentlyContinue
     Start-Sleep -Seconds 2
+    Write-Host "    All Oracle processes terminated"
 } else {
-    Write-Host "[1/6] Skipping instance shutdown (cleanup BEFORE restore)"
-    Write-Host "    Instance and service left in current state"
-    Write-Host "    Restore script will handle service state properly"
+    Write-Host "    Oracle service not found, will be created during restore"
 }
 
-Write-Host "[2/6] Oracle service preserved for reuse"
-if ($afterRestore) {
-    Write-Host "    Service stopped to release file locks"
-} else {
-    Write-Host "    Service remains in current state (running or stopped)"
-    Write-Host "    Optimization: If running, restore saves ~30s startup time"
-}
+Write-Host "[2/6] Oracle service stopped (clean state for restore)"
+Write-Host "    Service will be started fresh during restore"
+Write-Host "    This ensures no state inconsistencies (prevents ORA-00600)"
 
 Write-Host "[3/6] Deleting database files + SPFILE..."
 Write-Host "    Deleting datafiles..."
@@ -124,16 +118,16 @@ Write-Host ""
 Write-Host "Current state:"
 Write-Host "  [YES] Oracle software installed"
 Write-Host "  [YES] PFILE exists (C:\Users\oracle\admin\ROA\pfile\initROA.ora)"
-Write-Host "  [YES] Oracle service (preserved, will be reused)"
+Write-Host "  [YES] Oracle service (STOPPED for clean restore)"
 Write-Host "  [NO]  SPFILE (deleted to ensure PFILE startup)"
 Write-Host "  [NO]  Database files (will be restored from backups)"
 Write-Host "  [NO]  Control files (will be restored from backups)"
 Write-Host "  [NO]  Datafiles (will be restored from backups)"
 Write-Host ""
-Write-Host "VM is now in CLEAN STATE (service preserved)!"
+Write-Host "VM is now in CLEAN STATE (service stopped, ready for fresh start)!"
 Write-Host ""
 Write-Host "Next step: Run D:\oracle\scripts\rman_restore_from_zero.ps1"
-Write-Host "  (It will reuse the existing Oracle service and restore the database)"
+Write-Host "  (It will start the service fresh and restore the database)"
 Write-Host ""
 
 exit 0