diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 87c822d66..b20080960 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -63,7 +63,7 @@ my $checkdomain=0;
 
 # dhcp 4.x will use /etc/dhcp/dhcpd.conf as the config file
 my $dhcp6conffile;
-if ($^O ne 'aix' and -d "/etc/dhcp") {
+if ($^O ne 'aix' and not -e $dhcpconffile and -d "/etc/dhcp") {
     $dhcpconffile  = '/etc/dhcp/dhcpd.conf';
     $dhcp6conffile = '/etc/dhcp/dhcpd6.conf';
 }
diff --git a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
index 5ff28fc84..ef3a0b8ba 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
+++ b/xCAT-server/share/xcat/install/sles/compute.sle15.pkglist
@@ -4,3 +4,4 @@ openssl
 rsync
 insserv-compat
 net-tools-deprecated
+rsyslog
diff --git a/xCAT-server/share/xcat/install/sles/service.sle15.pkglist b/xCAT-server/share/xcat/install/sles/service.sle15.pkglist
index d90750118..d782eb9cd 100644
--- a/xCAT-server/share/xcat/install/sles/service.sle15.pkglist
+++ b/xCAT-server/share/xcat/install/sles/service.sle15.pkglist
@@ -1,8 +1,10 @@
 @base
 @x11
 openssl
+iputils
 ntp
 rsync
+rsyslog
 insserv-compat
 net-tools-deprecated
 nmap
@@ -13,12 +15,10 @@ perl-Expect
 perl-SNMP
 unixODBC
 perl-Net-DNS
+perl-DBD-Pg
+postgresql-server
 perl-DBD-mysql
 mariadb-client
-libmysqlclient18
-#   The following rpms are available on the SLES SDK
-#   You will need to locate and make these rpms available in your zypper
-#   repository for service node installs and uncomment the following lines:
-#MyODBC-unixODBC
-#perl-DBD-Pg
+#libmysqlclient18
+vim
 
diff --git a/xCAT-server/share/xcat/install/sles/service.sle15.ppc64le.otherpkgs.pkglist b/xCAT-server/share/xcat/install/sles/service.sle15.ppc64le.otherpkgs.pkglist
index 096209962..df2bb04d7 100644
--- a/xCAT-server/share/xcat/install/sles/service.sle15.ppc64le.otherpkgs.pkglist
+++ b/xCAT-server/share/xcat/install/sles/service.sle15.ppc64le.otherpkgs.pkglist
@@ -1,2 +1,2 @@
 xcat/xcat-core/xCATsn
-xcat/xcat-dep/sles12/ppc64le/goconserver
+xcat/xcat-dep/sles15/ppc64le/goconserver
diff --git a/xCAT-server/share/xcat/install/sles/service.sle15.tmpl b/xCAT-server/share/xcat/install/sles/service.sle15.tmpl
index 054fac79e..e75529258 100644
--- a/xCAT-server/share/xcat/install/sles/service.sle15.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sle15.tmpl
@@ -43,9 +43,14 @@
       </drive>
       <!-- XCAT-PARTITION-END -->
     </partitioning>
+    <add-on>
+        <add_on_products config:type="list">
+            #INSTALL_SOURCES#
+        </add_on_products>
+    </add-on>
     <software>
       <products config:type="list">
-        <product>SLES</product>
+          <product>SLES</product>
       </products>
       <patterns config:type="list">
         #INCLUDE_DEFAULT_PTRNLIST_S#
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist
index e54445878..a7024fc1c 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist
@@ -48,3 +48,5 @@ adaptec-firmware
 xz
 insserv-compat
 net-tools-deprecated
+rsyslog
+iputils
diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist
index e4b0ff54f..09bafa467 100644
--- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist
@@ -49,3 +49,4 @@ xz
 SLE_HPC-release
 insserv-compat
 net-tools-deprecated
+rsyslog
diff --git a/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist
index 159d86bd2..a01b69831 100644
--- a/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist
+++ b/xCAT-server/share/xcat/netboot/sles/service.sle15.pkglist
@@ -59,13 +59,15 @@ which
 zypper
 insserv-compat
 net-tools-deprecated
+rsyslog
 #for database
 unixODBC
 perl-DBD-mysql
 mariadb-client
-libmysqlclient18
+#libmysqlclient18
 #   The following rpms are available on the SLES SDK
 #   You will need to locate and make these rpms available in your zypper
 #   repository for service node installs and uncomment the following lines:
 #MyODBC-unixODBC
-#perl-DBD-Pg
+perl-DBD-Pg
+iputils
diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs
index 1161d1836..f595b1dc1 100755
--- a/xCAT/postscripts/otherpkgs
+++ b/xCAT/postscripts/otherpkgs
@@ -343,7 +343,7 @@ fi
         # (4) for other os, we just keep it here.
         # For other pkg paths, we just keep it here.
         if [ $dir == $default_pkgdir ] || [ $dir == "$default_pkgdir/" ]; then
-            if ( pmatch "$OSVER" "sles*" ); then
+            if ( pmatch "$OSVER" "sle*" ); then
                 OSPKGDIR="$OSPKGDIR/1"
                 ospkgdir="$ospkgdir/1"
             elif ( pmatch "$OSVER" "SL5*" ); then