diff --git a/build-rootfs-size-docker.sh b/build-rootfs-size-docker.sh
index 325d8c8..4acd278 100755
--- a/build-rootfs-size-docker.sh
+++ b/build-rootfs-size-docker.sh
@@ -20,23 +20,6 @@
 DOCKER_IMG_NAME=${DOCKER_IMG_NAME:-"openbmc/ubuntu-rootfs-size"}
 DISTRO=${DISTRO:-"ubuntu:bionic"}
 
-# Determine the architecture
-ARCH=$(uname -m)
-case ${ARCH} in
-    "ppc64le")
-        DOCKER_BASE="ppc64le/"
-        ;;
-    "x86_64")
-        DOCKER_BASE=""
-        ;;
-    "aarch64")
-        DOCKER_BASE="arm64v8/"
-        ;;
-    *)
-        echo "Unsupported system architecture(${ARCH}) found for docker image"
-        exit 1
-esac
-
 PROXY=""
 
 MIRROR=""
@@ -57,7 +40,7 @@
     fi
 
     Dockerfile=$(cat << EOF
-FROM ${DOCKER_BASE}${DISTRO}
+FROM ${DISTRO}
 
 ${PROXY}
 ${MIRROR}
diff --git a/build-setup.sh b/build-setup.sh
index fecf0dc..1a3255f 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -115,25 +115,6 @@
         echo \"deb ${UBUNTU_MIRROR} \$(. /etc/os-release && echo \$VERSION_CODENAME)-backports main restricted universe multiverse\" >> /etc/apt/sources.list"
 fi
 
-# Determine the architecture
-ARCH=$(uname -m)
-
-# Determine the prefix of the Dockerfile's base image
-case ${ARCH} in
-    "ppc64le")
-        DOCKER_BASE="ppc64le/"
-        ;;
-    "x86_64")
-        DOCKER_BASE=""
-        ;;
-    "aarch64")
-        DOCKER_BASE="arm64v8/"
-        ;;
-    *)
-        echo "Unsupported system architecture(${ARCH}) found for docker image"
-        exit 1
-esac
-
 # Timestamp for job
 echo "Build started, $(date)"
 
@@ -176,7 +157,7 @@
     fi
 
     Dockerfile=$(cat << EOF
-  FROM ${DOCKER_BASE}${distro}:${img_tag}
+  FROM ${distro}:${img_tag}
 
   ${PROXY}
 
@@ -230,7 +211,7 @@
     fi
 
     Dockerfile=$(cat << EOF
-  FROM ${DOCKER_BASE}${distro}:${img_tag}
+  FROM ${distro}:${img_tag}
 
   ${PROXY}
   ${MIRROR}
diff --git a/qemu-build.sh b/qemu-build.sh
index a00947d..3e5f422 100755
--- a/qemu-build.sh
+++ b/qemu-build.sh
@@ -34,9 +34,6 @@
     exit 1
 fi
 
-# Determine the architecture
-ARCH=$(uname -m)
-
 # Docker Image Build Variables:
 img_name=qemu-build
 
@@ -48,22 +45,6 @@
     PROXY="RUN echo \"Acquire::http::Proxy \\"\"${http_proxy}/\\"\";\" > /etc/apt/apt.conf.d/000apt-cacher-ng-proxy"
 fi
 
-# Determine the prefix of the Dockerfile's base image
-case ${ARCH} in
-    "ppc64le")
-        DOCKER_BASE="ppc64le/"
-        ;;
-    "x86_64")
-        DOCKER_BASE=""
-        ;;
-    "aarch64")
-        DOCKER_BASE="arm64v8/"
-        ;;
-    *)
-        echo "Unsupported system architecture(${ARCH}) found for docker image"
-        exit 1
-esac
-
 # Create the docker run script
 export PROXY_HOST=${http_proxy/#http*:\/\/}
 export PROXY_HOST=${PROXY_HOST/%:[0-9]*}
@@ -108,7 +89,7 @@
 # !!!
 
 Dockerfile=$(cat << EOF
-FROM ${DOCKER_BASE}ubuntu:jammy
+FROM ubuntu:jammy
 
 ${PROXY}
 
diff --git a/scripts/build-qemu-robot-docker.sh b/scripts/build-qemu-robot-docker.sh
index 6d30bce..49fa985 100755
--- a/scripts/build-qemu-robot-docker.sh
+++ b/scripts/build-qemu-robot-docker.sh
@@ -23,13 +23,6 @@
 UBUNTU_MIRROR=${UBUNTU_MIRROR:-""}
 PIP_MIRROR=${PIP_MIRROR:-""}
 
-# Determine our architecture, ppc64le or the other one
-if [ "$(uname -m)" == "ppc64le" ]; then
-    DOCKER_BASE="ppc64le/"
-else
-    DOCKER_BASE=""
-fi
-
 MIRROR=""
 if [[ -n "${UBUNTU_MIRROR}" ]]; then
     MIRROR="RUN echo \"deb ${UBUNTU_MIRROR} \$(. /etc/os-release && echo \$VERSION_CODENAME) main restricted universe multiverse\" > /etc/apt/sources.list && \
@@ -52,7 +45,7 @@
 ################################# docker img # #################################
 # Create docker image that can run QEMU and Robot Tests
 Dockerfile=$(cat << EOF
-FROM ${DOCKER_BASE}${DISTRO}
+FROM ${DISTRO}
 
 ${MIRROR}