diff --git a/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl b/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl
index 7094f022a..ee2bb0cd1 100644
--- a/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl
+++ b/xCAT-server/share/xcat/install/esx/base.esxi4.1.tmpl
@@ -5,8 +5,10 @@
 vmaccepteula
 
 # Set the root password for the DCUI and Tech Support Mode
-rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
+rootpw --iscrypted #CRYPT:passwd:key=vmware,username=root:password#
 
+# clear all partitions.
+clearpart --alldrives --overwritevmfs 
 # Choose the first disk (in channel/target/lun order) to install onto
 autopart --firstdisk --overwritevmfs
 
@@ -22,7 +24,13 @@ network --bootproto=dhcp
 reboot
 
 # A sample post-install script
-%post --unsupported --interpreter=python --ignorefailure=true
-import time
-stampFile = open('/finished.stamp', mode='w')
-stampFile.write( time.asctime() )
+%post --interpreter=busybox --unsupported --ignorefailure=true
+
+# tell xCAT management server we are done installing
+# have to put in the IP address instead of the hostname because VMware
+# ESXi 4.1 can not resolve IP addresses...
+echo "<xcatrequest>\n<command>nextdestiny</command>\n</xcatrequest>" | /bin/openssl s_client -quiet -connect #COMMAND: host #TABLE:noderes:$NODE:xcatmaster# | head -1 |  sed 's/.*address//g' #:3001 2>&1 | tee /tmp/foo.log
+
+# enable SSH on next boot:
+%firstboot --interpreter=busybox --unsupported --level=47
+sed -ie 's/#ssh/ssh/' /etc/inetd.conf #ssh is too nice not to have