diff --git a/xCAT-genesis-builder/dracut_105/el/xcat-cmdline.sh b/xCAT-genesis-builder/dracut_105/el/xcat-cmdline.sh
index cfe13783d..d0e6f053f 100755
--- a/xCAT-genesis-builder/dracut_105/el/xcat-cmdline.sh
+++ b/xCAT-genesis-builder/dracut_105/el/xcat-cmdline.sh
@@ -46,11 +46,11 @@ while :; do tmux new-session < /dev/tty2 &> /dev/tty2 ; done &
 
 # The section below is just for System P LE hardware discovery
 
-# Need to wait for NIC initialization
-sleep 20
 ARCH="$(uname -m)"
 
 if [[ ${ARCH} =~ ppc64 ]]; then
+    # Need to wait for NIC initialization (System P LE discovery only)
+    sleep 20
     # load all network driver modules listed in /lib/modules/<kernel>/modules.dep file
     KERVER=`uname -r`
     for line in `cat /lib/modules/$KERVER/modules.dep | awk -F: '{print \$1}' | sed -e "s/\(.*\)\.ko.*/\1/"`; do
diff --git a/xCAT-genesis-builder/dracut_105/ubuntu/xcat-cmdline.sh b/xCAT-genesis-builder/dracut_105/ubuntu/xcat-cmdline.sh
index c479f9e91..b6e3a0ce5 100755
--- a/xCAT-genesis-builder/dracut_105/ubuntu/xcat-cmdline.sh
+++ b/xCAT-genesis-builder/dracut_105/ubuntu/xcat-cmdline.sh
@@ -46,11 +46,11 @@ while :; do screen -ln < /dev/tty2 &> /dev/tty2 ; done &
 
 # The section below is just for System P LE hardware discovery
 
-# Need to wait for NIC initialization
-sleep 20
 ARCH="$(uname -m)"
 
 if [[ ${ARCH} =~ ppc64 ]]; then
+    # Need to wait for NIC initialization (System P LE discovery only)
+    sleep 20
     # load all network driver modules listed in /lib/modules/<kernel>/modules.dep file
     KERVER=`uname -r`
     for line in `cat /lib/modules/$KERVER/modules.dep | awk -F: '{print \$1}' | sed -e "s/\(.*\)\.ko.*/\1/"`; do
diff --git a/xCAT-genesis-builder/xcat-cmdline.sh b/xCAT-genesis-builder/xcat-cmdline.sh
index 15ead2175..525ea19c9 100755
--- a/xCAT-genesis-builder/xcat-cmdline.sh
+++ b/xCAT-genesis-builder/xcat-cmdline.sh
@@ -46,11 +46,11 @@ while :; do screen -ln < /dev/tty2 &> /dev/tty2 ; done &
 
 # The section below is just for System P LE hardware discovery
 
-# Need to wait for NIC initialization
-sleep 20
 ARCH="$(uname -m)"
 
 if [[ ${ARCH} =~ ppc64 ]]; then
+    # Need to wait for NIC initialization (System P LE discovery only)
+    sleep 20
     # load all network driver modules listed in /lib/modules/<kernel>/modules.dep file
     KERVER=`uname -r`
     for line in `cat /lib/modules/$KERVER/modules.dep | awk -F: '{print \$1}' | sed -e "s/\(.*\)\.ko.*/\1/"`; do