diff --git a/xCAT-server/share/xcat/install/rh/compute.pkglist b/xCAT-server/share/xcat/install/rh/compute.pkglist
index 6f327ab58..9819c7adf 100644
--- a/xCAT-server/share/xcat/install/rh/compute.pkglist
+++ b/xCAT-server/share/xcat/install/rh/compute.pkglist
@@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
diff --git a/xCAT-server/share/xcat/install/rh/compute.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/compute.ppc64.pkglist
index 6f327ab58..9819c7adf 100644
--- a/xCAT-server/share/xcat/install/rh/compute.ppc64.pkglist
+++ b/xCAT-server/share/xcat/install/rh/compute.ppc64.pkglist
@@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
diff --git a/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
index 72a77cca8..1623aba99 100644
--- a/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
@@ -148,10 +148,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel4.pkglist b/xCAT-server/share/xcat/install/rh/compute.rhel4.pkglist
index 572baa8bf..6704a58e2 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel4.pkglist
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel4.pkglist
@@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 pdksh
 tcsh
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
index 89d1593da..b0e9a9539 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
@@ -146,10 +146,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist
index fbb6e943f..eb3477d6f 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.pkglist
@@ -1,3 +1,6 @@
+@base
+@core
+@base-x
 fipscheck
 device-mapper-multipath
 sgpio
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl
index 0846ecd86..e2fd652dd 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel5.s390x.tmpl
@@ -22,9 +22,6 @@ clearpart --initlabel --drives=dasda
 part / --fstype ext3 --size=100 --grow --ondisk=dasda
 
 %packages
-@base
-@core
-@base-x
 #INCLUDE_DEFAULT_PKGLIST#
 
 %post
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel6.pkglist b/xCAT-server/share/xcat/install/rh/compute.rhel6.pkglist
index 3223fe288..675b27249 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel6.pkglist
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel6.pkglist
@@ -1,3 +1,4 @@
+#Please make sure there is a space between @ and group name
 ntp
 nfs-utils
 net-snmp
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel6.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/compute.rhel6.ppc64.pkglist
index 3223fe288..675b27249 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhel6.ppc64.pkglist
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel6.ppc64.pkglist
@@ -1,3 +1,4 @@
+#Please make sure there is a space between @ and group name
 ntp
 nfs-utils
 net-snmp
diff --git a/xCAT-server/share/xcat/install/rh/compute.tmpl b/xCAT-server/share/xcat/install/rh/compute.tmpl
index 5613fa3f1..f43ae2faa 100644
--- a/xCAT-server/share/xcat/install/rh/compute.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.tmpl
@@ -147,10 +147,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/hpc.rhel6.pkglist b/xCAT-server/share/xcat/install/rh/hpc.rhel6.pkglist
index 31898a56d..7c2fe6d70 100644
--- a/xCAT-server/share/xcat/install/rh/hpc.rhel6.pkglist
+++ b/xCAT-server/share/xcat/install/rh/hpc.rhel6.pkglist
@@ -1,3 +1,5 @@
+#Please make sure there is a space between @ and group name
+@ ofed
 openmpi
 ntp
 nfs-utils
diff --git a/xCAT-server/share/xcat/install/rh/hpc.rhel6.tmpl b/xCAT-server/share/xcat/install/rh/hpc.rhel6.tmpl
index 3cf147ed1..e1d433b08 100644
--- a/xCAT-server/share/xcat/install/rh/hpc.rhel6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/hpc.rhel6.tmpl
@@ -139,7 +139,6 @@ reboot
 #end of section
 #
 %packages
-@ ofed
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/iscsi.pkglist b/xCAT-server/share/xcat/install/rh/iscsi.pkglist
index 1f8b2cc5c..f9c6e72da 100644
--- a/xCAT-server/share/xcat/install/rh/iscsi.pkglist
+++ b/xCAT-server/share/xcat/install/rh/iscsi.pkglist
@@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
diff --git a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.pkglist
index 1f8b2cc5c..f9c6e72da 100644
--- a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.pkglist
+++ b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.pkglist
@@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
diff --git a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
index b95f4236f..0dcb95c10 100644
--- a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
@@ -150,10 +150,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/iscsi.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.tmpl
index 538438a3d..5559ed194 100644
--- a/xCAT-server/share/xcat/install/rh/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/rh/iscsi.tmpl
@@ -149,10 +149,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/kvm.pkglist b/xCAT-server/share/xcat/install/rh/kvm.pkglist
index 26dc4b14a..b3a6b535c 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.pkglist
+++ b/xCAT-server/share/xcat/install/rh/kvm.pkglist
@@ -1,3 +1,4 @@
+#Please make sure there is a space between @ and group name
 ntp
 nfs-utils
 sendmail-cf
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhel6.pkglist b/xCAT-server/share/xcat/install/rh/kvm.rhel6.pkglist
index e6f1f0975..9f3aaf09d 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhel6.pkglist
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhel6.pkglist
@@ -1,3 +1,4 @@
+#Please make sure there is a space between @ and group name
 libvirt
 qemu-kvm
 screen
diff --git a/xCAT-server/share/xcat/install/rh/service.pkglist b/xCAT-server/share/xcat/install/rh/service.pkglist
index 1f8b2cc5c..612667998 100644
--- a/xCAT-server/share/xcat/install/rh/service.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.pkglist
@@ -1,3 +1,9 @@
+#Please make sure there is a space between @ and group name
+@ Everything 
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
diff --git a/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist
index 1f8b2cc5c..612667998 100644
--- a/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist
@@ -1,3 +1,9 @@
+#Please make sure there is a space between @ and group name
+@ Everything 
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
diff --git a/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
index a88262fce..dbb06f17a 100644
--- a/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
@@ -149,11 +149,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Everything 
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/service.tmpl b/xCAT-server/share/xcat/install/rh/service.tmpl
index af49c156d..f43ae2faa 100644
--- a/xCAT-server/share/xcat/install/rh/service.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.tmpl
@@ -147,11 +147,6 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@ Everything 
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
diff --git a/xCAT-server/share/xcat/install/rh/storage.pglist b/xCAT-server/share/xcat/install/rh/storage.pglist
index 1f8b2cc5c..2c392ecc5 100644
--- a/xCAT-server/share/xcat/install/rh/storage.pglist
+++ b/xCAT-server/share/xcat/install/rh/storage.pglist
@@ -1,3 +1,9 @@
+#Please make sure there is a space between @ and group name
+@Everything
+@ Everything
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 ksh
 tcsh
@@ -20,3 +26,18 @@ binutils
 openssh-server
 util-linux
 compat-libstdc++-33
+-kernel-xen
+-kmod-cmirror-xen
+-xen-devel
+-kmod-gnbd-xen
+-xen
+-libvirt-devel
+-libvirt-cim
+-gnome-applet-vm
+-kmod-gfs-xen
+-xen-libs
+-libvirt
+-virt-viewer
+-libvirt-python
+-python-virtinst
+-virt-manager
diff --git a/xCAT-server/share/xcat/install/rh/storage.tmpl b/xCAT-server/share/xcat/install/rh/storage.tmpl
index 344e7d421..bc4ec3c15 100644
--- a/xCAT-server/share/xcat/install/rh/storage.tmpl
+++ b/xCAT-server/share/xcat/install/rh/storage.tmpl
@@ -152,27 +152,7 @@ reboot
 #end of section
 #
 %packages --resolvedeps
-@Everything
-@ Everything
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
--kernel-xen
--kmod-cmirror-xen
--xen-devel
--kmod-gnbd-xen
--xen
--libvirt-devel
--libvirt-cim
--gnome-applet-vm
--kmod-gfs-xen
--xen-libs
--libvirt
--virt-viewer
--libvirt-python
--python-virtinst
--virt-manager
 
 %pre
 #!/bin/sh
diff --git a/xCAT-server/share/xcat/install/rh/xen.pkglist b/xCAT-server/share/xcat/install/rh/xen.pkglist
index ac1f20898..6d3f1c8aa 100644
--- a/xCAT-server/share/xcat/install/rh/xen.pkglist
+++ b/xCAT-server/share/xcat/install/rh/xen.pkglist
@@ -1,3 +1,8 @@
+#Please make sure there is a space between @ and group name
+@ Network Servers
+@ System Tools
+@ X Window System
+@ Legacy Software Development
 autofs
 uucp
 xen
diff --git a/xCAT-server/share/xcat/install/rh/xen.tmpl b/xCAT-server/share/xcat/install/rh/xen.tmpl
index 5e34177c5..100d13962 100644
--- a/xCAT-server/share/xcat/install/rh/xen.tmpl
+++ b/xCAT-server/share/xcat/install/rh/xen.tmpl
@@ -146,10 +146,6 @@ reboot
 #end of section
 #
 %packages
-@ Network Servers
-@ System Tools
-@ X Window System
-@ Legacy Software Development
 #INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#