diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.postinstall
index eac5a8f4d..545ec8435 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.ppc64le.postinstall
@@ -40,6 +40,18 @@ then
     sed -i 's/SELINUX=enforcing\|permissive/SELINUX=disabled/' $installroot/etc/selinux/config
 fi
 
+#--for redhat 8 and 8.1
+#-- Need to disable firewalld, otherwise, the remoteshell script will not able to get all the SSH keys
+if [ -f "$installroot/etc/systemd/system/multi-user.target.wants/firewalld.service" ]
+then
+    rm -rf $installroot/etc/systemd/system/multi-user.target.wants/firewalld.service
+fi
+if [ -f "$installroot/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service" ]
+then
+    rm -rf $installroot/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service
+fi
+
+
 #-- Example of booted image versioning
 #-- We want to know, with what configuration (version of the image) each node was booted.
 #-- Hence, we keep image definition files and postscripts in CVS. During image generation we create file /etc/IMGVERSION and fill it with CVS "$Id$" of files with image definition (.pkglist, .exlist, .repolist, .postinstall). Then, during boot, each  "CVS enabled" postscript (see /install/postscripts/cvs_template.sh and /install/postscripts/cvs_template.pl) adds one line to /etc/IMGVERSION. Then you can determine in any time what image you are running and what postscipts in which versions were run.
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.postinstall
index 366e3d1df..e6728e1a7 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels8.x86_64.postinstall
@@ -39,6 +39,17 @@ if [ -f "$installroot/etc/selinux/config" ]
 then
     sed -i 's/SELINUX=enforcing\|permissive/SELINUX=disabled/' $installroot/etc/selinux/config
 fi
+#--for redhat 8 and 8.1
+#-- Need to disable firewalld, otherwise, the remoteshell script will not able to get all the SSH keys
+if [ -f "$installroot/etc/systemd/system/multi-user.target.wants/firewalld.service" ]
+then
+    rm -rf $installroot/etc/systemd/system/multi-user.target.wants/firewalld.service
+fi
+if [ -f "$installroot/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service" ]
+then
+    rm -rf $installroot/etc/systemd/system/dbus-org.fedoraproject.FirewallD1.service
+fi
+
 
 #-- Example of booted image versioning
 #-- We want to know, with what configuration (version of the image) each node was booted.