diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf
index 11f9b652b..612dc374f 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf
@@ -21,11 +21,13 @@
 #                       parameters, relative to
 #                       <Kit Build Directory>/other_files
 kit:
-   basename=teal-rhel
+   basename=teal
    description=teal for Linux
    version=1.2.0.2
    release=1
    ostype=Linux
+   osbasename=rhels
+   osarch=x86_64
    kitlicense=ILAN
 #   kitdeployparams=
 
@@ -106,92 +108,74 @@ kitrepo:
 #                         preinstall, postinstall, preuninstall, postuninstall, 
 #                         preupgrade, postupgrade, postbootscripts
 kitcomponent:
-    basename=teal-base
+    basename=teal_base
     description=teal for management nodes
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitpkgdeps=teal-base >= 1.2.0.2
+    kitpkgdeps=teal-base
 
 kitcomponent:
-    basename=teal-gpfs
+    basename=teal_gpfs
     description=teal for gpfs
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-gpfs >= 1.2.0.2,teal-gpfs-sn >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-gpfs,teal-gpfs-sn
 
 kitcomponent:
-    basename=teal-ib
+    basename=teal_ib
     description=teal for ib
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-ib >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-ib
 
 kitcomponent:
-    basename=teal-isnm
+    basename=teal_isnm
     description=teal for isnm 
-    version=1.2.0.1
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-isnm >= 1.2.0.1
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-isnm
 
 kitcomponent:
-    basename=teal-ll
+    basename=teal_ll
     description=teal for pnsd 
-    version=1.2.0.0
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-isnm >= 1.2.0.0
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-isnm
 
 kitcomponent:
-    basename=teal-pnsd
+    basename=teal_pnsd
     description=teal for pnsd
-    version=1.2.0.0
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitpkgdeps=teal-pnsd >= 1.2.0.0
+    kitpkgdeps=teal-pnsd
 
 kitcomponent:
-    basename=teal-sfp
+    basename=teal_sfp
     description=teal for sfp
-    version=1.2.0.0
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64 
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-sfp >= 1.2.0.0
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-sfp
 
 kitcomponent:
-    basename=teal-syslog
+    basename=teal_syslog
     description=teal for syslog
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-syslog >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-syslog
 
 kitcomponent:
-    basename=teal-test
+    basename=teal_test
     description=teal test
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-test >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-test
 
 # kitpackage: This section defines one Kit Package, and how to build it.
 #             There can be zero or more kitpackage sections.  
@@ -240,64 +224,64 @@ kitcomponent:
 #                   4. Build RPM from source RPM
 #                       rpm_srpm:  Path to source RPM package.
 kitpackage:
-    filename=teal-base-1.2.0.2-*.x86_64.rpm
+    filename=teal-base-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
    
 kitpackage:
-    filename=teal-gpfs-1.2.0.2-*.x86_64.rpm
+    filename=teal-gpfs-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-gpfs-sn-1.2.0.2-*.x86_64.rpm
+    filename=teal-gpfs-sn-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-ib-1.2.0.2-*.x86_64.rpm
+    filename=teal-ib-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-isnm-1.2.0.1-*.x86_64.rpm
+    filename=teal-isnm-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 
 kitpackage:
-    filename=teal-ll-1.2.0.0-*.x86_64.rpm
+    filename=teal-ll-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 
 kitpackage:
-    filename=teal-pnsd-1.2.0.0-*.x86_64.rpm
+    filename=teal-pnsd-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 
 kitpackage:
-    filename=teal-sfp-1.2.0.0-*.x86_64.rpm
+    filename=teal-sfp-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 kitpackage:
-    filename=teal-syslog-1.2.0.2-*.x86_64.rpm
+    filename=teal-syslog-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-test-1.2.0.2-*.x86_64.rpm
+    filename=teal-test-1.2.0*.x86_64.rpm
     kitrepoid=rhels6_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf
index 3bf872bb4..421c256cf 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf
@@ -21,11 +21,13 @@
 #                       parameters, relative to
 #                       <Kit Build Directory>/other_files
 kit:
-   basename=teal-sles
+   basename=teal
    description=teal for Linux
    version=1.2.0.2
    release=1
    ostype=Linux
+   osbasename=sles
+   osarch=x86_64
    kitlicense=ILAN
 #   kitdeployparams=
 
@@ -106,94 +108,75 @@ kitrepo:
 #                         preinstall, postinstall, preuninstall, postuninstall, 
 #                         preupgrade, postupgrade, postbootscripts
 kitcomponent:
-    basename=teal-base
+    basename=teal_base
     description=teal for management nodes
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-base >= 1.2.0.2
+    kitpkgdeps=teal-base
 
 kitcomponent:
-    basename=teal-gpfs
+    basename=teal_gpfs
     description=teal for gpfs
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-gpfs >= 1.2.0.2,teal-gpfs-sn >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-gpfs,teal-gpfs-sn
 
 kitcomponent:
-    basename=teal-ib
+    basename=teal_ib
     description=teal for ib
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-ib >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-ib
 
 kitcomponent:
-    basename=teal-isnm
+    basename=teal_isnm
     description=teal for isnm
-    version=1.2.0.1
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-isnm >= 1.2.0.1
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-isnm 
 
 kitcomponent:
-    basename=teal-ll
+    basename=teal_ll
     description=teal for pnsd
-    version=1.2.0.0
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-isnm >= 1.2.0.0
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-isnm 
 
 kitcomponent:
-    basename=teal-pnsd
+    basename=teal_pnsd
     description=teal for pnsd
-    version=1.2.0.0
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64 
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-pnsd >= 1.2.0.0
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-pnsd
 
 kitcomponent:
-    basename=teal-sfp
+    basename=teal_sfp
     description=teal for sfp
-    version=1.2.0.0
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-sfp >= 1.2.0.0
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-sfp
 
 kitcomponent:
-    basename=teal-syslog
+    basename=teal_syslog
     description=teal for syslog
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-syslog >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-syslog
 
 kitcomponent:
-    basename=teal-test
+    basename=teal_test
     description=teal test
-    version=1.2.0.2
-    release=1
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
-    kitpkgdeps=teal-test >= 1.2.0.2
+    kitcompdeps=teal_base
+    kitpkgdeps=teal-test
 
 # kitpackage: This section defines one Kit Package, and how to build it.
 #             There can be zero or more kitpackage sections.  
@@ -242,64 +225,64 @@ kitcomponent:
 #                   4. Build RPM from source RPM
 #                       rpm_srpm:  Path to source RPM package.
 kitpackage:
-    filename=teal-base-1.2.0.2-*.x86_64.rpm
+    filename=teal-base-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
    
 kitpackage:
-    filename=teal-gpfs-1.2.0.2-*.x86_64.rpm
+    filename=teal-gpfs-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-gpfs-sn-1.2.0.2-*.x86_64.rpm
+    filename=teal-gpfs-sn-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-ib-1.2.0.2-*.x86_64.rpm
+    filename=teal-ib-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-isnm-1.2.0.1-*.x86_64.rpm
+    filename=teal-isnm-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 
 kitpackage:
-    filename=teal-ll-1.2.0.0-*.x86_64.rpm
+    filename=teal-ll-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 
 kitpackage:
-    filename=teal-pnsd-1.2.0.0-*.x86_64.rpm
+    filename=teal-pnsd-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 
 kitpackage:
-    filename=teal-sfp-1.2.0.0-*.x86_64.rpm
+    filename=teal-sfp-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
     
 kitpackage:
-    filename=teal-syslog-1.2.0.2-*.x86_64.rpm
+    filename=teal-syslog-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes
 
 kitpackage:
-    filename=teal-test-1.2.0.2-*.x86_64.rpm
+    filename=teal-test-1.2.0*.x86_64.rpm
     kitrepoid=sles11_x86_64
     # Method 1: Use pre-built RPM package
     isexternalpkg=yes