diff --git a/elements/centos7/root.d/10-centos7-cloud-image b/elements/centos7/root.d/10-centos7-cloud-image
index cd79a4180..7db1557de 100755
--- a/elements/centos7/root.d/10-centos7-cloud-image
+++ b/elements/centos7/root.d/10-centos7-cloud-image
@@ -9,10 +9,10 @@ set -o pipefail
 [ -n "$ARCH" ]
 [ -n "$TARGET_ROOT" ]
 
-if [ 'amd64' = "$ARCH" ] ; then
+if [[ "amd64 x86_64" =~ "$ARCH" ]]; then
     ARCH="x86_64"
 else
-    echo 'centos7 root element only support the amd64 $ARCH value.'
+    echo 'centos7 root element only support the x86_64 $ARCH value.'
     exit 1
 fi
 
diff --git a/elements/rhel7/root.d/10-rhel7-cloud-image b/elements/rhel7/root.d/10-rhel7-cloud-image
index be38caa45..bc54b1010 100755
--- a/elements/rhel7/root.d/10-rhel7-cloud-image
+++ b/elements/rhel7/root.d/10-rhel7-cloud-image
@@ -9,10 +9,10 @@ set -o pipefail
 [ -n "$ARCH" ]
 [ -n "$TARGET_ROOT" ]
 
-if [ 'amd64' = "$ARCH" ] ; then
+if [[ "amd64 x86_64" =~ "$ARCH" ]]; then
     ARCH="x86_64"
 else
-    echo 'rhel7 root element only support the amd64 $ARCH value.'
+    echo 'rhel7 root element only support the x86_64 $ARCH value.'
     exit 1
 fi
 
diff --git a/elements/rpm-distro/pre-install.d/01-override-yum-arch b/elements/rpm-distro/pre-install.d/01-override-yum-arch
index ff84375c6..138bf3134 100755
--- a/elements/rpm-distro/pre-install.d/01-override-yum-arch
+++ b/elements/rpm-distro/pre-install.d/01-override-yum-arch
@@ -9,7 +9,7 @@ set -o pipefail
 if [ "i386" = "$ARCH" ]; then
     basearch=i386
     arch=i686
-elif [ "amd64" = "$ARCH" ]; then
+elif [[ "amd64 x86_64" =~ "$ARCH" ]]; then
     basearch=x86_64
     arch=x86_64
 elif [[ "$ARCH" = "ppc64" ]]; then