diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index bad41f5b1..8ef13fd28 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -195,13 +195,13 @@ GO_XCAT_DEP_REPOSITORY_IDS=(xcat-dep)
 GO_XCAT_INSTALL_LIST=(perl-xCAT xCAT-client xCAT xCAT-buildkit
 	xCAT-genesis-scripts-ppc64 xCAT-genesis-scripts-x86_64 xCAT-server
 	elilo-xcat grub2-xcat ipmitool-xcat syslinux-xcat
-	xCAT-genesis-base-ppc64 xCAT-genesis-base-x86_64 xnba-undi)
+	xCAT-genesis-base-ppc64 xCAT-genesis-base-x86_64 ipxe-xcat xnba-undi)
 # For Debian/Ubuntu, it will need a slightly different package list
 type dpkg >/dev/null 2>&1 &&
 GO_XCAT_INSTALL_LIST=(perl-xcat xcat-client xcat xcat-buildkit
 	xcat-genesis-scripts-amd64 xcat-genesis-scripts-ppc64el xcat-server
 	elilo-xcat grub2-xcat ipmitool-xcat syslinux-xcat
-	xcat-genesis-base-amd64 xcat-genesis-base-ppc64el xnba-undi)
+	xcat-genesis-base-amd64 xcat-genesis-base-ppc64el ipxe-xcat xnba-undi)
 # The package list of all the packages should be uninstalled
 GO_XCAT_UNINSTALL_LIST=("${GO_XCAT_INSTALL_LIST[@]}"
 	goconserver xCAT-SoftLayer xCAT-confluent xCAT-csm xCAT-genesis-builder
diff --git a/xCAT/debian/control b/xCAT/debian/control
index edda1c42b..62e0f0adb 100644
--- a/xCAT/debian/control
+++ b/xCAT/debian/control
@@ -9,7 +9,7 @@ Homepage: https://xcat.org/
 
 Package: xcat
 Architecture: amd64 ppc64el riscv64
-Depends: ${perl:Depends}, goconserver(>= 0.3.3-snap000000000000), xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, isc-dhcp-server | kea, bind9, apache2, nfs-kernel-server, libxml-parser-perl, rsync, tftpd-hpa, libnet-telnet-perl, chrony | ntp, nmap, ipmitool-xcat (>= 1.8.18-4), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000) [amd64], xcat-genesis-scripts-ppc64el (>= 2.13-snap000000000000) [ppc64el]
+Depends: ${perl:Depends}, goconserver(>= 0.3.3-snap000000000000), xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, isc-dhcp-server | kea, bind9, apache2, nfs-kernel-server, libxml-parser-perl, rsync, tftpd-hpa, libnet-telnet-perl, chrony | ntp, nmap, ipmitool-xcat (>= 1.8.18-4), ipxe-xcat, xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000) [amd64], xcat-genesis-scripts-ppc64el (>= 2.13-snap000000000000) [ppc64el]
 Recommends: net-tools, kea, tftp-hpa, syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, util-linux-extra, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000), xcat-genesis-openembedded-x86-64, xcat-genesis-openembedded-ppc64le, xcat-genesis-openembedded-riscv64, xcat-genesis-openembedded-s390x
 Suggests: yaboot-xcat
 Description: Metapackage for a common, default xCAT setup
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 10ea2f7e2..84fad6d9f 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -94,6 +94,7 @@ Requires: goconserver >= 0.3.3-snap202011021058
 %endif
 
 %ifarch i386 i586 i686 x86 x86_64
+Requires: ipxe-xcat >= 2.0.0-1
 Requires: xnba-undi >= 1.21.1-1
 Requires: syslinux-xcat >= 6.03-1
 Requires: ipmitool-xcat >= 1.8.18-4
@@ -102,6 +103,7 @@ Requires: ipmitool-xcat >= 1.8.18-4
 %ifos linux
 %ifarch ppc ppc64 ppc64le
 # Mixed-arch management nodes also need the x86 PXE stack kept current.
+Requires: ipxe-xcat >= 2.0.0-1
 Requires: xnba-undi >= 1.21.1-1
 Requires: syslinux-xcat >= 6.03-1
 Requires: ipmitool-xcat >= 1.8.18-4
@@ -110,8 +112,9 @@ Requires: ipmitool-xcat >= 1.8.18-4
 
 %ifos linux
 %ifarch riscv64
-# riscv64 management nodes manage BMC based nodes; the x86 PXE loaders are
-# x86-only packages and riscv64 nodes boot through UEFI and grub2.
+# riscv64 nodes boot through UEFI and grub2. A riscv64 management node can serve x86
+# nodes, which boot the upstream iPXE loader.
+Requires: ipxe-xcat >= 2.0.0-1
 Requires: ipmitool-xcat >= 1.8.18-4
 %endif
 %endif
diff --git a/xCATsn/debian/control b/xCATsn/debian/control
index d4e508f5c..e7d71490b 100644
--- a/xCATsn/debian/control
+++ b/xCATsn/debian/control
@@ -8,7 +8,7 @@ Homepage: https://xcat.org/
 
 Package: xcatsn
 Architecture: amd64 ppc64el riscv64
-Depends: ${perl:Depends}, goconserver (>=0.3.3-snap000000000000), xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, libnet-telnet-perl, isc-dhcp-server | kea, bind9, apache2, nfs-kernel-server, nmap, ipmitool-xcat (>= 1.8.18-4), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000) [amd64], xcat-genesis-scripts-ppc64el (>= 2.13-snap000000000000) [ppc64el]
+Depends: ${perl:Depends}, goconserver (>=0.3.3-snap000000000000), xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, libnet-telnet-perl, isc-dhcp-server | kea, bind9, apache2, nfs-kernel-server, nmap, ipmitool-xcat (>= 1.8.18-4), ipxe-xcat, xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000) [amd64], xcat-genesis-scripts-ppc64el (>= 2.13-snap000000000000) [ppc64el]
 Recommends: net-tools, kea, tftp-hpa, syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000), xcat-genesis-openembedded-x86-64, xcat-genesis-openembedded-ppc64le, xcat-genesis-openembedded-riscv64, xcat-genesis-openembedded-s390x
 Suggests: yaboot-xcat
 Description: Metapackage for a common, default xCAT service node setup
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index d683e2bdc..f7ddff0d9 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -70,17 +70,15 @@ Requires: goconserver >= 0.3.3
 %endif
 
 %ifarch i386 i586 i686 x86 x86_64
+Requires: ipxe-xcat
 Requires: xnba-undi
 Requires: syslinux-xcat
 Requires: ipmitool-xcat >= 1.8.17-1
 %endif
 %ifos linux
-%ifarch ppc ppc64 ppc64le
-Requires: ipmitool-xcat >= 1.8.17-1
-%endif
-%endif
-%ifos linux
-%ifarch riscv64
+%ifarch ppc ppc64 ppc64le riscv64
+# A POWER or riscv64 service node can serve x86 nodes, which boot the upstream iPXE loader.
+Requires: ipxe-xcat
 Requires: ipmitool-xcat >= 1.8.17-1
 %endif
 %endif