diff --git a/builder/Dockerfile.opensuse-154 b/builder/Dockerfile.opensuse-154
index 9bce666..a3fc669 100644
--- a/builder/Dockerfile.opensuse-154
+++ b/builder/Dockerfile.opensuse-154
@@ -67,7 +67,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \
     && zypper clean
 
 # Install AWS CLI
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -p).zip" -o "awscliv2.zip" && \
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
     unzip awscliv2.zip && \
     ./aws/install && \
     rm -rf aws awscliv2.zip
diff --git a/builder/Dockerfile.rhel-9 b/builder/Dockerfile.rhel-9
index a96ea65..315836d 100644
--- a/builder/Dockerfile.rhel-9
+++ b/builder/Dockerfile.rhel-9
@@ -46,7 +46,7 @@ RUN dnf -y upgrade \
     && dnf clean all
 
 # Install AWS CLI
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -p).zip" -o "awscliv2.zip" && \
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
     unzip awscliv2.zip && \
     ./aws/install && \
     rm -rf aws awscliv2.zip
diff --git a/builder/build.sh b/builder/build.sh
index e40064d..f5eb38b 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -67,7 +67,7 @@ compile_r() {
 
   # tools/config.guess in R versions older than 3.2.2 guess 'unknown' instead of 'pc'
   # test the version and properly set the flag.
-  build_flag="--build=$(uname -p)-pc-linux-gnu"
+  build_flag="--build=$(uname -m)-pc-linux-gnu"
   if _version_is_greater_than ${R_VERSION} 3.2.2; then
     build_flag=''
   fi
diff --git a/install.sh b/install.sh
index 7c3dd97..234d75e 100755
--- a/install.sh
+++ b/install.sh
@@ -497,7 +497,7 @@ do_install () {
   prompt_version
   [ -z $SELECTED_VERSION ] && { echo "Invalid version"; exit 1; }
 
-  arch=$(uname -p)
+  arch=$(uname -m)
 
   # Get the name of the installer to use
   installer_file_name=$(download_name "${os}" "${SELECTED_VERSION}" "${arch}")