diff --git a/build-utils/rpm-architectures.sh b/build-utils/rpm-architectures.sh
new file mode 100644
index 000000000..80c215796
--- /dev/null
+++ b/build-utils/rpm-architectures.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Architecture sets shared by the RPM build entry points and their tests.
+XCAT_CORE_RPM_ARCHES="x86_64 ppc64 ppc64le s390x aarch64 riscv64"
+XCAT_LOCAL_RPM_ARCHES="x86_64 ppc64 s390x aarch64 riscv64"
+XCAT_LOCAL_COLLECT_ARCHES="noarch x86_64 ppc64 riscv64"
diff --git a/buildcore.sh b/buildcore.sh
index fbe85a7bf..fb0ebe503 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -37,6 +37,7 @@
 
 SCRIPT=$(readlink -f $0)
 SCRIPTPATH=`dirname $SCRIPT`
+. "$SCRIPTPATH/build-utils/rpm-architectures.sh"
 
 . "$SCRIPTPATH/build-utils/source-only.sh"
 . "$SCRIPTPATH/build-utils/buildcore-source-only.sh"
@@ -392,7 +393,7 @@ for rpmname in xCAT xCATsn; do
             ./makerpm $rpmname "$EMBED"
             if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi
         else
-            for arch in $(xcat_rpm_build_arches x86_64 ppc64 ppc64le s390x aarch64 riscv64); do
+            for arch in $(xcat_rpm_build_arches $XCAT_CORE_RPM_ARCHES); do
                 if [ "$rpmname" = "xCAT-OpenStack" -a "$arch" != "x86_64" ] || [ "$rpmname" = "xCAT-OpenStack-baremetal" -a "$arch" != "x86_64" ] ; then continue; fi         # only bld openstack for x86_64 for now
                 ./makerpm $rpmname $arch "$EMBED"
                 if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi
diff --git a/buildlocal.sh b/buildlocal.sh
index c5cc13f78..f8e94e8a5 100755
--- a/buildlocal.sh
+++ b/buildlocal.sh
@@ -20,6 +20,8 @@ if [ -z "$CURDIR" ]; then
    CURDIR=$(pwd)
 fi
 
+. "$CURDIR/build-utils/rpm-architectures.sh"
+
 echo "CURDIR is $CURDIR"
 echo "OSNAME is $OSNAME!"
 echo "NAMEALL is $NAMEALL"
@@ -87,15 +89,13 @@ else
 echo "This is an $OSNAME system"
 
      if [ "$OS" = "SUSE" ]; then
-         rm -rf /usr/src/packages/RPMS/noarch/*
-         rm -rf /usr/src/packages/RPMS/x86_64/*
-         rm -rf /usr/src/packages/RPMS/ppc64/*
-         rm -rf /usr/src/packages/RPMS/riscv64/*
+         for arch in $XCAT_LOCAL_COLLECT_ARCHES; do
+             rm -rf /usr/src/packages/RPMS/$arch/*
+         done
      else
-         rm -rf /root/rpmbuild/RPMS/noarch/*
-         rm -rf /root/rpmbuild/RPMS/x86_64/*
-         rm -rf /root/rpmbuild/RPMS/ppc64/*
-         rm -rf /root/rpmbuild/RPMS/riscv64/*
+         for arch in $XCAT_LOCAL_COLLECT_ARCHES; do
+             rm -rf /root/rpmbuild/RPMS/$arch/*
+         done
      fi
 
      mkdir -p $CURDIR/build/
@@ -125,7 +125,7 @@ echo "This is an $OSNAME system"
                         $CURDIR/makerpm $rpmname
                         if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi
                 else
-                        for arch in x86_64 ppc64 s390x aarch64 riscv64; do
+                        for arch in $XCAT_LOCAL_RPM_ARCHES; do
                                 $CURDIR/makerpm $rpmname $arch
                                 if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi
                         done
@@ -133,15 +133,13 @@ echo "This is an $OSNAME system"
   done
 
   if [ "$OS" = "SUSE" ]; then
-      cp /usr/src/packages/RPMS/noarch/* $CURDIR/build/
-      cp /usr/src/packages/RPMS/x86_64/* $CURDIR/build/
-      cp /usr/src/packages/RPMS/ppc64/* $CURDIR/build/
-      cp /usr/src/packages/RPMS/riscv64/* $CURDIR/build/
+      for arch in $XCAT_LOCAL_COLLECT_ARCHES; do
+          cp /usr/src/packages/RPMS/$arch/* $CURDIR/build/
+      done
   else
-      cp /root/rpmbuild/RPMS/noarch/* $CURDIR/build/
-      cp /root/rpmbuild/RPMS/x86_64/* $CURDIR/build/
-      cp /root/rpmbuild/RPMS/ppc64/* $CURDIR/build/
-      cp /root/rpmbuild/RPMS/riscv64/* $CURDIR/build/
+      for arch in $XCAT_LOCAL_COLLECT_ARCHES; do
+          cp /root/rpmbuild/RPMS/$arch/* $CURDIR/build/
+      done
   fi
 
   #begin to create repo for redhat platform
@@ -165,4 +163,3 @@ EOF
 
 fi
 
-