diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index a0a1ebfbb..90361fc34 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -75,8 +75,8 @@ sub handled_commands{
 		rmvm => 'nodehm:mgt',
 		rinv => 'nodehm:mgt',
                 chvm => 'nodehm:mgt',
-        lsvm => 'hypervisor:type',
-		rmhypervisor => 'hypervisor:type',
+        lsvm => ['hypervisor:type','nodetype:os=(esx.*)'],
+		rmhypervisor => ['hypervisor:type','nodetype:os=(esx.*)'],
 		#lsvm => 'nodehm:mgt', not really supported yet
 	};
 }
diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index 5d6af13f6..b9cb875f3 100644
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -70,10 +70,10 @@ sub handled_commands {
     #rvitals => 'nodehm:mgt',
     #rinv => 'nodehm:mgt',
     getrvidparms => 'nodehm:mgt',
-    lsvm => 'hypervisor:type',
+    lsvm => ['hypervisor:type','nodetype.os=(rhel.*)'],
     rbeacon => 'nodehm:mgt',
-    revacuate => 'hypervisor:type',
-    vmstatenotify => 'hypervisor:type',
+    revacuate => ['hypervisor:type','nodetype.os=(rhel.*)|(sles11.*)|(centos.*)|(fedora.*)'],
+    vmstatenotify => ['hypervisor:type','nodetype.os=(rhel.*)|(sles11.*)|(centos.*)|(fedora.*)'],
     #rspreset => 'nodehm:mgt',
     #rspconfig => 'nodehm:mgt',
     #rbootseq => 'nodehm:mgt',