diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index 623032d76..e35c29f50 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -5122,6 +5122,11 @@ sub nodeSet {
                     while (length($device) < 4) {
                         $device = "0" . $device;
                     }
+                    
+                    # zFCP variables must be in lower-case or AutoYast would get confused
+                    $device = lc($device);
+                    $wwpn = lc($wwpn);
+                    $lun = lc($lun);
         
                     # Find tag in template and attach SCSI device associated with it
                     $out = `sed --in-place -e "s#$tag#/dev/disk/by-path/ccw-0.0.$device-zfcp-0x$wwpn:0x$lun#i" $customTmpl`;
@@ -5362,6 +5367,11 @@ END
                         $device = "0" . $device;
                     }
 
+                    # zFCP variables must be in lower-case or AutoYast would get confused.
+                    $device = lc($device);
+                    $wwpn = lc($wwpn);
+                    $lun = lc($lun);
+
                     # Create zfcp section
                     $zfcpSection = "zfcp --devnum 0.0.$device --wwpn 0x$wwpn --fcplun 0x$lun" . '\n';
                     
diff --git a/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl b/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl
index d48ac620b..071980b7a 100644
--- a/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/zfcp.sles10.s390x.tmpl
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE profile>
-<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">  
+<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+
   <general>
     <mode>
       <confirm config:type="boolean">false</confirm>
@@ -292,7 +293,18 @@
     <!-- Root partition and swap space -->
     <drive>
       <device>replace_root_device</device>
+      <initialize config:type="boolean">true</initialize>
       <partitions config:type="list">
+        <partition>
+          <create config:type="boolean">true</create>
+          <filesystem config:type="symbol">swap</filesystem>
+          <format config:type="boolean">true</format>
+          <mount>swap</mount>
+          <mountby config:type="symbol">path</mountby>
+          <partition_id config:type="integer">130</partition_id>
+          <partition_nr config:type="integer">1</partition_nr>
+          <size>auto</size>
+        </partition>
         <partition>
           <create config:type="boolean">true</create>
           <filesystem config:type="symbol">ext3</filesystem>
@@ -300,25 +312,14 @@
           <mount>/</mount>
           <mountby config:type="symbol">path</mountby>
           <partition_id config:type="integer">131</partition_id>
-          <partition_nr config:type="integer">1</partition_nr>
+          <partition_nr config:type="integer">2</partition_nr>
           <size>max</size>
         </partition>
-        <partition>
-          <create config:type="boolean">true</create>
-          <filesystem config:type="symbol">swap</filesystem>
-          <format config:type="boolean">true</format>
-          <mount>swap</mount>
-          <mountby config:type="symbol">path</mountby>
-          <partition_id config:type="integer">131</partition_id>
-          <partition_nr config:type="integer">1</partition_nr>
-          <partition_type>primary</partition_type>
-          <size>auto</size>
-        </partition>
       </partitions>
       <use>all</use>
     </drive>
   </partitioning>
-    
+
   
   <proxy>
     <enabled config:type="boolean">false</enabled>
@@ -369,7 +370,7 @@
       replace_software_packages
     </packages>
   </software>
-    
+  
   
   <!-- Time zone -->
   <timezone>
diff --git a/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl b/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl
index c0c9a9d6e..071980b7a 100644
--- a/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/zfcp.sles11.s390x.tmpl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE profile>
 <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
-  
+
   <general>
     <mode>
       <confirm config:type="boolean">false</confirm>
@@ -293,7 +293,18 @@
     <!-- Root partition and swap space -->
     <drive>
       <device>replace_root_device</device>
+      <initialize config:type="boolean">true</initialize>
       <partitions config:type="list">
+        <partition>
+          <create config:type="boolean">true</create>
+          <filesystem config:type="symbol">swap</filesystem>
+          <format config:type="boolean">true</format>
+          <mount>swap</mount>
+          <mountby config:type="symbol">path</mountby>
+          <partition_id config:type="integer">130</partition_id>
+          <partition_nr config:type="integer">1</partition_nr>
+          <size>auto</size>
+        </partition>
         <partition>
           <create config:type="boolean">true</create>
           <filesystem config:type="symbol">ext3</filesystem>
@@ -301,24 +312,14 @@
           <mount>/</mount>
           <mountby config:type="symbol">path</mountby>
           <partition_id config:type="integer">131</partition_id>
-          <partition_nr config:type="integer">1</partition_nr>
+          <partition_nr config:type="integer">2</partition_nr>
           <size>max</size>
         </partition>
-        <partition>
-          <create config:type="boolean">true</create>
-          <filesystem config:type="symbol">swap</filesystem>
-          <format config:type="boolean">true</format>
-          <mount>swap</mount>
-          <mountby config:type="symbol">path</mountby>
-          <partition_id config:type="integer">131</partition_id>
-          <partition_nr config:type="integer">1</partition_nr>
-          <partition_type>primary</partition_type>
-          <size>auto</size>
-        </partition>
       </partitions>
       <use>all</use>
     </drive>
   </partitioning>
+
   
   <proxy>
     <enabled config:type="boolean">false</enabled>