diff --git a/docs/source/advanced/hierarchy/databases/postgres_configure.rst b/docs/source/advanced/hierarchy/databases/postgres_configure.rst
index c3a1bb449..09e3a00c4 100644
--- a/docs/source/advanced/hierarchy/databases/postgres_configure.rst
+++ b/docs/source/advanced/hierarchy/databases/postgres_configure.rst
@@ -24,8 +24,8 @@ If you had the following two service nodes: ::
 
 You would add the following to ``/var/lib/pgsql/data/pg_hba.conf`` ::
 
-    host    all          all        192.168.1.10/24      md5
-    host    all          all        192.168.1.11/24      md5
+    host    all          all        192.168.1.10/32      md5
+    host    all          all        192.168.1.11/32      md5
 
 Restart PostgreSQL after editing the file: ::
 
diff --git a/xCAT-server/share/xcat/install/rh/service.rhels8.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels8.pkglist
deleted file mode 120000
index 9615de6af..000000000
--- a/xCAT-server/share/xcat/install/rh/service.rhels8.pkglist
+++ /dev/null
@@ -1 +0,0 @@
-compute.rhels8.pkglist
\ No newline at end of file
diff --git a/xCAT-server/share/xcat/install/rh/service.rhels8.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels8.pkglist
new file mode 100644
index 000000000..f0fb7b17e
--- /dev/null
+++ b/xCAT-server/share/xcat/install/rh/service.rhels8.pkglist
@@ -0,0 +1,12 @@
+@^minimal-environment
+chrony
+net-tools
+nfs-utils
+openssh-server
+rsync
+util-linux
+wget
+mariadb-connector-odbc
+perl-DBD-MySQL
+perl-DBD-Pg
+unixODBC
diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
new file mode 100644
index 000000000..93a7f7974
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels8.ppc64le.pkglist
@@ -0,0 +1,35 @@
+bash
+bc
+bzip2
+chrony
+coreutils
+curl
+dhcp-client
+dracut
+dracut-network
+e2fsprogs
+ethtool
+file
+gzip
+hostname
+iputils
+irqbalance
+kernel
+lsvpd
+net-tools
+nfs-utils
+openssh-clients
+openssh-server
+openssl
+parted
+procps-ng
+rpm
+rsync
+rsyslog
+tar
+util-linux
+vim-minimal
+xz
+wget
+perl-DBD-MySQL
+perl-DBD-Pg
diff --git a/xCAT-server/share/xcat/netboot/rh/service.rhels8.x86_64.pkglist b/xCAT-server/share/xcat/netboot/rh/service.rhels8.x86_64.pkglist
new file mode 100644
index 000000000..43aee0ac4
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/rh/service.rhels8.x86_64.pkglist
@@ -0,0 +1,34 @@
+bash
+bc
+bzip2
+chrony
+coreutils
+curl
+dhcp-client
+dracut
+dracut-network
+e2fsprogs
+ethtool
+file
+gzip
+hostname
+iputils
+irqbalance
+kernel
+net-tools
+nfs-utils
+openssh-clients
+openssh-server
+openssl
+parted
+procps-ng
+rpm
+rsync
+rsyslog
+tar
+util-linux
+vim-minimal
+xz
+wget
+perl-DBD-MySQL
+perl-DBD-Pg
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index f8c3531f2..102218b0e 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -40,7 +40,7 @@ Requires: /usr/sbin/dhcpd
 # On RHEL this pulls in openssh-server, on SLES it pulls in openssh
 Requires: /usr/bin/ssh
 %ifnarch s390x
-Requires: /etc/xinetd.d/tftp
+Requires: /usr/sbin/in.tftpd
 # Stty is only needed for rcons on ppc64 nodes, but for mixed clusters require it on both x and p
 Requires: perl-IO-Stty
 %endif
@@ -81,9 +81,10 @@ Requires: syslinux-xcat
 %endif
 
 %description
-xCATsn is a service node management package intended for at-scale management,
-including hardware management and software management.
-
+xCAT supports management of very large sized cluster by creating a Hierarchical
+Cluster and the concept of xCAT Service Nodes. The xCAT Management Node can
+delegate all management operational needs to the Service Node responsible for a
+set of compute node. xCATsn package provides xCAT service node support.
 
 %prep
 %ifos linux