diff --git a/Deploy-ZabbixAgent2.ps1 b/Deploy-ZabbixAgent2.ps1
index be24c28..7261f51 100644
--- a/Deploy-ZabbixAgent2.ps1
+++ b/Deploy-ZabbixAgent2.ps1
@@ -49,18 +49,23 @@ else {
 $osInfo   = Get-CimInstance -ClassName Win32_OperatingSystem
 $Hostname = $env:COMPUTERNAME
 
+# Workstations
 if ($osInfo.ProductType -eq 1) {
     $Role = "Workstation"
 }
-elseif ($Hostname -match '-ss\d*') {
+# Primary: SQL servers (e.g., EHPS-SS19L, EHTS-SS16A, BI-SS22B)
+elseif ($Hostname -match '-ss\d{2}[a-z]?') {
     $Role = "SQL"
 }
+# Primary: Application servers (e.g., EHTS-APP38, BI-APP02)
 elseif ($Hostname -match '-app\d*') {
     $Role = "Application"
 }
+# Secondary Fallback: Running standalone default MSSQLSERVER instance on non-standard naming
 elseif (Get-Service -Name "MSSQLSERVER" -ErrorAction SilentlyContinue | Where-Object { $_.Status -eq "Running" }) {
     $Role = "SQL"
 }
+# Default: Member servers, DCs, and general workloads
 else {
     $Role = "Application"
 }