diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 756b097..980328b 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -197,7 +197,7 @@ truncate -c -s 0 /var/log/yum.log
 
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -m)
+basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 echo "Packages within this cloud image:"
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 1808117..29be3c2 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -281,7 +281,7 @@ systemctl enable tmp.mount
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -m)
+basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa