diff --git a/defaults.inc b/defaults.inc
index c707cad1..227ea05b 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 VERS='2.1-05152023'
 
@@ -39,6 +40,12 @@ POWERWALL_SERVICES['Temp']='monitor-temp'
 POWERWALL_SERVICES['ACV']='monitor-acv'
 POWERWALL_SERVICES['powerlogger']='monitor-powerlogger'
 
+declare -A ESXI_HOST_NAMES
+ESXI_HOST_NAMES['10.10.1.10']='ids-vms-scsi.scity.us'
+ESXI_HOST_NAMES['10.10.1.11']='ids-vms1.scity.us'
+ESXI_HOST_NAMES['10.10.1.12']='ids-vms2.scity.us'
+ESXI_HOST_NAMES['10.10.1.17']='ids-vms7.scity.us'
+
 
 MAINHOSTS=10.10.2.10,10.10.2.11,10.10.2.12
 SYSHOSTS=10.10.2.17
diff --git a/esxi-scripts/host-maintenance_mode.ps1 b/esxi-scripts/host-maintenance_mode.ps1
index beb4b60e..cf04ce32 100755
--- a/esxi-scripts/host-maintenance_mode.ps1
+++ b/esxi-scripts/host-maintenance_mode.ps1
@@ -2,6 +2,6 @@
 
 . /opt/idssys/powerwall/settings.ps1
 
-Connect-VIServer -Server 10.10.1.30 -Protocol https -User administrator@scity.vs -Password 'Dc$@1910'
+Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS
 
-Get-VMHost -Name ids-vms7.scity.us | set-vmhost -State Maintenance
+Get-VMHost -Name $args[0] | set-vmhost -State Maintenance
diff --git a/powerwall.sh b/powerwall.sh
index 89651f69..24a94966 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -424,7 +424,7 @@ SHUTDOWN_SERVERS(){
 }
 SHUTDOWN_SERVER(){
 	echo -en "Enabling Maintenance mode and will wait for iSCSI VM's to begin migrating ... "
-	ssh root@${1} 'esxcli system maintenanceMode set -e true -t 0 &' &
+	${FOLDER}/esxi-scripts/host-maintenance_modce.ps1 ${ESXI_HOST_NAMES[${1}]} >/dev/null 2>&1
 	ssh root@${VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
 	ssh root@${VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1
 	sleep 30s