diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index e487688d0..5b9ca2eab 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -4961,7 +4961,7 @@ sub mkcommonboot {
 		}
         $append = $prepend.$append;
 	}
-	elsif ($osver =~ /esxi5/) { #do a more straightforward thing..
+	elsif ($osver =~ /esxi[56]/) { #do a more straightforward thing..
 	  $kernel = "$tp/mboot.c32";
       if (-r "$tftpdir/$tp/boot.cfg.$bootmode.tmpl") { #so much for straightforward..
 	  	$shortappend = "-c $tp/boot.cfg.$bootmode.$node";
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 084ae60ac..78012e387 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -226,7 +226,7 @@ sub setstate {
               print $pcfg "\n";
             }
             print $pcfg "IPAPPEND 2\n";
-	    if ($kern->{kernel} =~ /esxi5/) { #Make uefi boot provisions
+	    if ($kern->{kernel} =~ /esxi[56]/) { #Make uefi boot provisions
 	       my $ucfg;
 	       open($ucfg,'>',$tftpdir."/xcat/xnba/nodes/".$node.".uefi");
 	       if ($kern->{kcmdline} =~ / xcat\/netboot/) {