diff --git a/xCAT-server/share/xcat/install/centos/all.pkglist b/xCAT-server/share/xcat/install/centos/all.pkglist
new file mode 100644
index 000000000..741044ce7
--- /dev/null
+++ b/xCAT-server/share/xcat/install/centos/all.pkglist
@@ -0,0 +1,23 @@
+#kernel-smp
+autofs
+ksh
+tcsh
+ntp
+tftp
+xinetd
+rsh
+rsh-server
+psacct
+nfs-utils
+net-snmp
+rsync
+yp-tools
+ypserv
+ypbind
+m4
+sendmail-cf
+gdb
+binutils
+openssh-server
+util-linux
+compat-libstdc++-33
diff --git a/xCAT-server/share/xcat/install/centos/all.tmpl b/xCAT-server/share/xcat/install/centos/all.tmpl
index 980615d29..99ed3ddd9 100644
--- a/xCAT-server/share/xcat/install/centos/all.tmpl
+++ b/xCAT-server/share/xcat/install/centos/all.tmpl
@@ -155,29 +155,7 @@ reboot
 @ System Tools
 @ X Window System
 @ Legacy Software Development
-#kernel-smp
-autofs
-ksh
-tcsh
-ntp
-tftp
-xinetd
-rsh
-rsh-server
-psacct
-nfs-utils
-net-snmp
-rsync
-yp-tools
-ypserv
-ypbind
-m4
-sendmail-cf
-gdb
-binutils
-openssh-server
-util-linux
-compat-libstdc++-33
+#INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
diff --git a/xCAT-server/share/xcat/install/centos/compute.pkglist b/xCAT-server/share/xcat/install/centos/compute.pkglist
new file mode 100644
index 000000000..cf978e0e6
--- /dev/null
+++ b/xCAT-server/share/xcat/install/centos/compute.pkglist
@@ -0,0 +1,22 @@
+autofs
+tcsh
+ntp
+tftp
+xinetd
+rsh
+rsh-server
+psacct
+nfs-utils
+net-snmp
+rsync
+yp-tools
+ypserv
+ypbind
+m4
+sendmail-cf
+gdb
+bzip2
+binutils
+openssh-server
+util-linux
+compat-libstdc++-33
diff --git a/xCAT-server/share/xcat/install/centos/compute.tmpl b/xCAT-server/share/xcat/install/centos/compute.tmpl
index 23963e8a3..89d1593da 100644
--- a/xCAT-server/share/xcat/install/centos/compute.tmpl
+++ b/xCAT-server/share/xcat/install/centos/compute.tmpl
@@ -150,28 +150,7 @@ reboot
 @ System Tools
 @ X Window System
 @ Legacy Software Development
-autofs
-tcsh
-ntp
-tftp
-xinetd
-rsh
-rsh-server
-psacct
-nfs-utils
-net-snmp
-rsync
-yp-tools
-ypserv
-ypbind
-m4
-sendmail-cf
-gdb
-bzip2
-binutils
-openssh-server
-util-linux
-compat-libstdc++-33
+#INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
diff --git a/xCAT-server/share/xcat/install/centos/iscsi.pkglist b/xCAT-server/share/xcat/install/centos/iscsi.pkglist
new file mode 100644
index 000000000..1f8b2cc5c
--- /dev/null
+++ b/xCAT-server/share/xcat/install/centos/iscsi.pkglist
@@ -0,0 +1,22 @@
+autofs
+ksh
+tcsh
+ntp
+tftp
+xinetd
+rsh
+rsh-server
+psacct
+nfs-utils
+net-snmp
+rsync
+yp-tools
+ypserv
+ypbind
+m4
+sendmail-cf
+gdb
+binutils
+openssh-server
+util-linux
+compat-libstdc++-33
diff --git a/xCAT-server/share/xcat/install/centos/iscsi.tmpl b/xCAT-server/share/xcat/install/centos/iscsi.tmpl
index 90a9b0bd3..538438a3d 100644
--- a/xCAT-server/share/xcat/install/centos/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/centos/iscsi.tmpl
@@ -153,28 +153,7 @@ reboot
 @ System Tools
 @ X Window System
 @ Legacy Software Development
-autofs
-ksh
-tcsh
-ntp
-tftp
-xinetd
-rsh
-rsh-server
-psacct
-nfs-utils
-net-snmp
-rsync
-yp-tools
-ypserv
-ypbind
-m4
-sendmail-cf
-gdb
-binutils
-openssh-server
-util-linux
-compat-libstdc++-33
+#INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
diff --git a/xCAT-server/share/xcat/install/centos/storage.pkglist b/xCAT-server/share/xcat/install/centos/storage.pkglist
new file mode 100644
index 000000000..1f8b2cc5c
--- /dev/null
+++ b/xCAT-server/share/xcat/install/centos/storage.pkglist
@@ -0,0 +1,22 @@
+autofs
+ksh
+tcsh
+ntp
+tftp
+xinetd
+rsh
+rsh-server
+psacct
+nfs-utils
+net-snmp
+rsync
+yp-tools
+ypserv
+ypbind
+m4
+sendmail-cf
+gdb
+binutils
+openssh-server
+util-linux
+compat-libstdc++-33
diff --git a/xCAT-server/share/xcat/install/centos/storage.tmpl b/xCAT-server/share/xcat/install/centos/storage.tmpl
index 70b98747f..344e7d421 100644
--- a/xCAT-server/share/xcat/install/centos/storage.tmpl
+++ b/xCAT-server/share/xcat/install/centos/storage.tmpl
@@ -157,28 +157,7 @@ reboot
 @ System Tools
 @ X Window System
 @ Legacy Software Development
-autofs
-ksh
-tcsh
-ntp
-tftp
-xinetd
-rsh
-rsh-server
-psacct
-nfs-utils
-net-snmp
-rsync
-yp-tools
-ypserv
-ypbind
-m4
-sendmail-cf
-gdb
-binutils
-openssh-server
-util-linux
-compat-libstdc++-33
+#INCLUDE_DEFAULT_PKGLIST#
 -kernel-xen
 -kmod-cmirror-xen
 -xen-devel
diff --git a/xCAT-server/share/xcat/install/centos/xen.pkglist b/xCAT-server/share/xcat/install/centos/xen.pkglist
new file mode 100644
index 000000000..ac1f20898
--- /dev/null
+++ b/xCAT-server/share/xcat/install/centos/xen.pkglist
@@ -0,0 +1,26 @@
+autofs
+uucp
+xen
+libvirt
+kernel-xen
+tcsh
+ntp
+tftp
+xinetd
+rsh
+rsh-server
+psacct
+nfs-utils
+net-snmp
+rsync
+yp-tools
+ypserv
+ypbind
+m4
+sendmail-cf
+gdb
+bzip2
+binutils
+openssh-server
+util-linux
+compat-libstdc++-33
diff --git a/xCAT-server/share/xcat/install/centos/xen.tmpl b/xCAT-server/share/xcat/install/centos/xen.tmpl
index b4779212b..5e34177c5 100644
--- a/xCAT-server/share/xcat/install/centos/xen.tmpl
+++ b/xCAT-server/share/xcat/install/centos/xen.tmpl
@@ -150,32 +150,7 @@ reboot
 @ System Tools
 @ X Window System
 @ Legacy Software Development
-autofs
-uucp
-xen
-libvirt
-kernel-xen
-tcsh
-ntp
-tftp
-xinetd
-rsh
-rsh-server
-psacct
-nfs-utils
-net-snmp
-rsync
-yp-tools
-ypserv
-ypbind
-m4
-sendmail-cf
-gdb
-bzip2
-binutils
-openssh-server
-util-linux
-compat-libstdc++-33
+#INCLUDE_DEFAULT_PKGLIST#
 %pre
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post