diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 8ca1ddb83..96717869a 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -121,7 +121,10 @@ if [ -d /install/postscripts/.xcat ]; then
 fi
 chkconfig vsftpd on
 /etc/init.d/vsftpd start
-if [ "$1" = "1" ]; then #Only if installing for the fist time..
+# remove any service node file
+ rm  /etc/xCATSN
+
+if [ "$1" = "1" ]; then #Only if installing for the first time..
     mkdir -p /root/.ssh
     chmod 700 /root/.ssh
     echo StrictHostKeyChecking no >> /root/.ssh/config
@@ -188,6 +191,7 @@ if [ "$1" = "1" ]; then #Only if installing for the fist time..
 	fi
     # make Management Node
 	touch /etc/xCATMN
+
 	# setup syslog
         /install/postscripts/syslog
     #fi
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index abd51bfc2..cc15191dc 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -51,7 +51,8 @@ if [ "$1" = "1" ]; then #Only if installing for the first time..
 
 # makes it a service node
   touch /etc/xCATSN
-
+# remove any management node file
+  rm  /etc/xCATMN