diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
index 7ec38d2ea..7a7702557 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl
@@ -20,16 +20,6 @@
                     <CreatePartitions>
                         <CreatePartition>
                             <Order>1</Order>
-                            <Type>EFI</Type>
-                            <Size>50</Size>
-                        </CreatePartition>
-                        <CreatePartition>
-                            <Order>2</Order>
-                            <Type>MSR</Type>
-                            <Size>128</Size>
-                        </CreatePartition>
-                        <CreatePartition>
-                            <Order>3</Order>
                             <Type>Primary</Type>
                             <Extend>true</Extend>
                         </CreatePartition>
@@ -55,8 +45,6 @@
             </ImageInstall>
             <UserData>
                 <AcceptEula>true</AcceptEula>
-                <FullName>xCAT USER</FullName>
-                <Organization>xCAT</Organization>
             	#WINPRODKEY:win2012.datacenter#
             </UserData>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
index 7ec38d2ea..f4a87d3f6 100644
--- a/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/datacenter.win2012.x86_64.tmpl.uefi
@@ -21,7 +21,7 @@
                         <CreatePartition>
                             <Order>1</Order>
                             <Type>EFI</Type>
-                            <Size>50</Size>
+                            <Size>260</Size>
                         </CreatePartition>
                         <CreatePartition>
                             <Order>2</Order>
diff --git a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
index 9eb395265..f78d71158 100644
--- a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl
@@ -45,8 +45,6 @@
             </ImageInstall>
             <UserData>
                 <AcceptEula>true</AcceptEula>
-                <FullName>xCAT USER</FullName>
-                <Organization>xCAT</Organization>
             </UserData>
         </component>
     </settings>
diff --git a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
index f3d84141f..26827488c 100644
--- a/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/hypervisor.hyperv2012.x86_64.tmpl.uefi
@@ -21,7 +21,7 @@
                         <CreatePartition>
                             <Order>1</Order>
                             <Type>EFI</Type>
-                            <Size>50</Size>
+                            <Size>260</Size>
                         </CreatePartition>
                         <CreatePartition>
                             <Order>2</Order>
@@ -55,8 +55,6 @@
             </ImageInstall>
             <UserData>
                 <AcceptEula>true</AcceptEula>
-                <FullName>xCAT USER</FullName>
-                <Organization>xCAT</Organization>
             </UserData>
         </component>
     </settings>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
index 7b76f1c12..0c428746b 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl
@@ -45,8 +45,6 @@
             </ImageInstall>
             <UserData>
                 <AcceptEula>true</AcceptEula>
-                <FullName>xCAT USER</FullName>
-                <Organization>xCAT</Organization>
             	#WINPRODKEY:win2012.standard#
             </UserData>
         </component>
diff --git a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
index 9db2b8f1a..c0c7a68df 100644
--- a/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
+++ b/xCAT-server/share/xcat/install/windows/standard.win2012.x86_64.tmpl.uefi
@@ -21,7 +21,7 @@
                         <CreatePartition>
                             <Order>1</Order>
                             <Type>EFI</Type>
-                            <Size>50</Size>
+                            <Size>260</Size>
                         </CreatePartition>
                         <CreatePartition>
                             <Order>2</Order>
@@ -55,8 +55,6 @@
             </ImageInstall>
             <UserData>
                 <AcceptEula>true</AcceptEula>
-                <FullName>xCAT USER</FullName>
-                <Organization>xCAT</Organization>
             	#WINPRODKEY:win2012.standard#
             </UserData>
         </component>