diff --git a/install_newt-msp-site-win_v2.sh b/install_newt-msp-site-win_v2.sh
index 7c38db7..cd9278c 100644
--- a/install_newt-msp-site-win_v2.sh
+++ b/install_newt-msp-site-win_v2.sh
@@ -1,7 +1,7 @@
 <#
 .SYNOPSIS
-    Windows-Installer für den Newt-Client.
-    Finaler Fix für sc.exe via CMD-Wrapper.
+    Windows-Installer für den Newt-Client (MAIEREDV Managed Site Client).
+    Nutzt NSSM für ein sauberes Dienst-Management.
 #>
 param([string]$mode = "install")
 
@@ -9,23 +9,41 @@ param([string]$mode = "install")
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 
+# 2. Konfiguration
 $Repo = "fosrl/newt"
 $InstallDir = "C:\Program Files\me-msp-newt"
 $ServiceName = "MAIEREDV-Managed-Site-Client"
 $Symlink = "$InstallDir\newt_latest.exe"
-$TaskName = "Newt-Updater"
+$NssmPath = "$InstallDir\nssm.exe"
+$UpdaterTaskName = "MAIEREDV-Newt-Updater"
 $GiteaUrl = "https://gitea.vmd55888.de/manuel.maier/update-install-newt/raw/branch/main/install_newt-msp-site_v2.ps1"
 
 function Write-Log($msg, $color = "White") { Write-Host "[$(Get-Date -Format 'HH:mm:ss')] $msg" -ForegroundColor $color }
 
+# 3. NSSM bereitstellen (falls nicht vorhanden)
+function Get-NSSM {
+    if (Test-Path $NssmPath) { return }
+    Write-Log "NSSM wird heruntergeladen..." "Cyan"
+    $nssmZip = "$env:TEMP\nssm.zip"
+    $nssmDownloadUrl = "https://nssm.cc/release/nssm-2.24.zip"
+    
+    Invoke-WebRequest -Uri $nssmDownloadUrl -OutFile $nssmZip -UseBasicParsing
+    Expand-Archive -Path $nssmZip -DestinationPath "$env:TEMP\nssm_temp" -Force
+    
+    $archDir = if ([Environment]::Is64BitOperatingSystem) { "win64" } else { "win32" }
+    Copy-Item "$env:TEMP\nssm_temp\nssm-2.24\$archDir\nssm.exe" -Destination $NssmPath -Force
+    
+    Remove-Item $nssmZip -ErrorAction SilentlyContinue
+    Remove-Item "$env:TEMP\nssm_temp" -Recurse -ErrorAction SilentlyContinue
+}
+
 function Get-LatestVersion {
     try {
         $url = "https://api.github.com/repos/$Repo/releases/latest"
         $json = Invoke-RestMethod -Uri $url -UseBasicParsing
         return $json.tag_name
     } catch {
-        Write-Log "FEHLER: Konnte Version nicht abrufen." "Red"
-        exit 1
+        Write-Log "FEHLER: Konnte Version nicht abrufen." "Red"; exit 1
     }
 }
 
@@ -37,15 +55,15 @@ function Download-Newt {
     $Target = "$InstallDir\newt_$VersionOnly.exe"
 
     if (!(Test-Path $InstallDir)) { New-Item -ItemType Directory -Path $InstallDir -Force | Out-Null }
+    Get-NSSM
 
     Write-Log "Download von: $Url" "Cyan"
     try {
         Start-BitsTransfer -Source $Url -Destination $Target -ErrorAction Stop
         Copy-Item -Path $Target -Destination $Symlink -Force
-        Write-Log "Installation erfolgreich: $Target" "Green"
+        Write-Log "Datei geladen: $VersionOnly" "Green"
     } catch {
-        Write-Log "FEHLER beim Download: $_" "Red"
-        exit 1
+        Write-Log "FEHLER beim Download: $_" "Red"; exit 1
     }
 }
 
@@ -58,38 +76,27 @@ function Setup-Service {
 
         if ([string]::IsNullOrWhiteSpace($PangolinID)) { Write-Log "FEHLER: ID leer!" "Red"; exit 1 }
 
-        # Wir bauen den Befehl für CMD.exe zusammen. 
-        # Das ist der sicherste Weg, damit die Leerzeichen nach dem '=' erhalten bleiben.
         $ArgList = "--id $PangolinID --secret $PangolinSecret --endpoint $PangolinEndpoint"
-        $BinaryPath = "powershell.exe -WindowStyle Hidden -Command \`"$Symlink $ArgList\`""
         
-        Write-Log "Erstelle Windows Dienst via CMD-Wrapper..." "Cyan"
+        Write-Log "Erstelle Dienst mit NSSM..." "Cyan"
+        & $NssmPath install $ServiceName "$Symlink" $ArgList
+        & $NssmPath set $ServiceName Description "MAIEREDV Managed Site Client"
+        & $NssmPath set $ServiceName AppExit Default Restart
+        & $NssmPath set $ServiceName AppRestartDelay 5000
         
-        # Der Trick: Wir rufen cmd /c auf und übergeben den sc-Befehl als String.
-        # Beachte die Leerstellen nach den '=' Zeichen!
-        $cmdCommand = "sc create $ServiceName binPath= ""$BinaryPath"" DisplayName= ""MAIEREDV Managed Site Client"" start= auto"
-        
-        cmd.exe /c $cmdCommand
-        
-        Start-Sleep -Seconds 2
-        
-        if (Get-Service $ServiceName -ErrorAction SilentlyContinue) {
-            Start-Service $ServiceName
-            Write-Log "Dienst erfolgreich gestartet." "Green"
-        } else {
-            Write-Log "FEHLER: Dienst konnte nicht erstellt werden." "Red"
-        }
+        Start-Service $ServiceName
+        Write-Log "Dienst wurde erfolgreich erstellt und gestartet." "Green"
     } else {
         Write-Log "Dienst existiert bereits. Starte neu..." "Yellow"
         Restart-Service $ServiceName
     }
 }
 
-function Setup-UpdateTask {
+function Setup-UpdaterTask {
     $ActionCommand = "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command `"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iex ((New-Object System.Net.WebClient).DownloadString('$GiteaUrl')) -mode update`""
     $Action = New-ScheduledTaskAction -Execute "powershell.exe" -Argument $ActionCommand
     $Trigger = New-ScheduledTaskTrigger -Daily -At 3am
-    Register-ScheduledTask -Action $Action -Trigger $Trigger -TaskName $TaskName -User "SYSTEM" -Force | Out-Null
+    Register-ScheduledTask -Action $Action -Trigger $Trigger -TaskName $UpdaterTaskName -User "SYSTEM" -Force | Out-Null
     Write-Log "Update-Task erstellt." "Green"
 }
 
@@ -99,8 +106,8 @@ switch ($mode) {
         $v = Get-LatestVersion
         Download-Newt $v
         Setup-Service
-        Setup-UpdateTask
-        Write-Log "Installation abgeschlossen!" "Green"
+        Setup-UpdaterTask
+        Write-Log "Installation mit NSSM abgeschlossen!" "Green"
     }
     "update" {
         $v = Get-LatestVersion
@@ -110,15 +117,16 @@ switch ($mode) {
         } else {
             Download-Newt $v
             Restart-Service $ServiceName
-            Write-Log "Update auf $v durchgefuehrt." "Green"
+            Write-Log "Update via NSSM-Dienst abgeschlossen." "Green"
         }
     }
     "uninstall" {
+        Write-Log "Deinstallation..." "Yellow"
         if (Get-Service $ServiceName -ErrorAction SilentlyContinue) {
-            Stop-Service $ServiceName -Force
-            cmd.exe /c "sc delete $ServiceName"
+            Stop-Service $ServiceName -Force -ErrorAction SilentlyContinue
+            & $NssmPath remove $ServiceName confirm
         }
-        Unregister-ScheduledTask -TaskName $TaskName -Confirm:$false -ErrorAction SilentlyContinue
-        Write-Log "Deinstalliert." "Green"
+        Unregister-ScheduledTask -TaskName $UpdaterTaskName -Confirm:$false -ErrorAction SilentlyContinue
+        Write-Log "Alles entfernt." "Green"
     }
 }
\ No newline at end of file