diff --git a/esxi-scripts/cls-shutdown.ps1 b/esxi-scripts/cls-shutdown.ps1
new file mode 100755
index 00000000..67382b04
--- /dev/null
+++ b/esxi-scripts/cls-shutdown.ps1
@@ -0,0 +1,9 @@
+#!/usr/bin/env pwsh
+
+. /opt/idssys/powerwall/settings.ps1
+
+Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null
+
+Get-VM | Where {$_.PowerState -like '*On*' -and $_.Name -like '*CLS*'} | Shutdown-VMGuest -Confirm:$false
+
+exit 0
diff --git a/powerwall.sh b/powerwall.sh
index 12c625e2..d3b31e77 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1164,10 +1164,6 @@ MAINT_MODE_VERIFY_SHUTDOWN(){
 	if [ "${ESXIHOST}" == "10.10.2.10" ]; then
 		while ping -qw 10 -c3 "${ESXIHOST}">/dev/null 2>&1; do sleep 1; done
 		 "$(CHECK_HOST ${ESXIHOST})" != "false" ] && snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2
-		echo -e "${idsCL[Green]}Done\n"
-		
-	else
-		echo -e "${idsCL[LightCyan]}The host ${host} (${ESXIHOST}) will be shutdown momentarily ... \n"
 	fi
 }
 SHUTDOWN_SERVER(){
@@ -1234,6 +1230,7 @@ SHUTDOWN_SERVER(){
 				[ "${ESXIHOST}" == "10.10.2.17" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1)
 				run=$(${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1)
 			fi
+			run=$(${PW_FOLDER}/esxi-scripts/cls-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1)
 		fi
 		echo -e "${idsCL[Green]}Done\n"