diff --git a/xCAT-genesis-builder/oe/build b/xCAT-genesis-builder/oe/build
index 93656d61c..8a53b0525 100755
--- a/xCAT-genesis-builder/oe/build
+++ b/xCAT-genesis-builder/oe/build
@@ -6,6 +6,12 @@ oe_dir=$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd)
 : "${XCAT_GENESIS_WORK_DIR:=$oe_dir/.work}"
 : "${KAS:=kas}"
 
+supported_architectures='aarch64 armv7hf riscv64 s390x x86 x86_64 ppc64 ppc64le'
+if [ "$#" -eq 1 ] && [ "$1" = '--list-architectures' ]; then
+    printf '%s\n' $supported_architectures
+    exit 0
+fi
+
 mkdir -p "$XCAT_GENESIS_WORK_DIR"
 
 export KAS_WORK_DIR="$XCAT_GENESIS_WORK_DIR"
@@ -16,8 +22,8 @@ if [ "$#" -eq 0 ]; then
 fi
 
 for architecture do
-    case "$architecture" in
-        aarch64|armv7hf|riscv64|s390x|x86|x86_64|ppc64|ppc64le) ;;
+    case " $supported_architectures " in
+        *" $architecture "*) ;;
         *)
             printf 'Unsupported Genesis architecture: %s\n' "$architecture" >&2
             exit 2