diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
index 16caef70d..b3624b067 100644
--- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
@@ -1556,9 +1556,16 @@ sub update_osdistro_table
 
     my $ostype="Linux";  #like Linux, Windows
     if (($osver =~ /^win/) || ($osver =~ /^imagex/)) {
-        $osver="windows";
+	if ($osver =~ /^win\d/) {
+		$osver =~ s/^win/windows/;
+	} elsif ($osver =~ /^imagex/) {
+        	$osver="windows";
+	}
         $ostype="Windows";
     }
+    if ($osver =~ /hyperv/) {
+	$ostype = "Windows";
+    }
 
 
    unless($distname){