diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl
index 55edc48e6..3c827e4bb 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels8.tmpl
@@ -17,7 +17,7 @@ lang en_US.UTF-8
 # Root password
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 # System services
-services --disabled="NetworkManager"
+#services --disabled="NetworkManager"
 # System timezone
 timezone #TABLE:site:key=timezone:value# --isUtc
 # Partition clearing information
diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels8 b/xCAT-server/share/xcat/install/scripts/post.rhels8
index cdc119e25..4c52c1c26 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rhels8
+++ b/xCAT-server/share/xcat/install/scripts/post.rhels8
@@ -19,5 +19,7 @@ do
     fi
 done
 
-# Dirty hack for RHEL8 Alpha
-chkconfig network on
+GRUBOUT=$(find /boot -name grub.cfg)
+sed -i -e 's/GRUB.*TERMINAL=.*/GRUB_TERMINAL="console"/' -e 's/GRUB_SERIAL_COMMAND=.*//' /etc/sysconfig/grub
+sed -i -e 's/GRUB.*TERMINAL=.*/GRUB_TERMINAL="console"/' -e 's/GRUB_SERIAL_COMMAND=.*//' /etc/default/grub
+grub2-mkconfig -o $GRUBOUT