diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index f67c67bdb..3162d71fa 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -303,7 +303,9 @@ sub preprocess_updatenode
  flags";
         $callback->($rsp);
         return;
-    } else { 
+    } 
+    # For -s flag just run this one script
+    if ($::SETSERVER) {
        $::RERUNPS            = "setuppostbootscripts";
     }
     # -f or -F not both