diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index 7f11ee46edf..4360b8731b7 100755
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -16,14 +16,24 @@ SCRIPT_DIR="$(pwd)/.gitlab-ci/container"
 SKQP_PATCH_DIR="${SCRIPT_DIR}/patches"
 BASE_ARGS_GN_FILE="${SCRIPT_DIR}/build-skqp_base.gn"
 
-SKQP_ARCH=${SKQP_ARCH:-x64}
+case "$DEBIAN_ARCH" in
+  amd64)
+    SKQP_ARCH=x64
+    ;;
+  armhf)
+    SKQP_ARCH=arm
+    ;;
+  arm64)
+    SKQP_ARCH=arm64
+    ;;
+esac
+
 SKIA_DIR=${SKIA_DIR:-$(mktemp -d)}
 SKQP_OUT_DIR=${SKIA_DIR}/out/${SKQP_ARCH}
 SKQP_INSTALL_DIR=${SKQP_INSTALL_DIR:-/skqp}
 SKQP_ASSETS_DIR="${SKQP_INSTALL_DIR}/assets"
 SKQP_BINARIES=(skqp list_gpu_unit_tests list_gms)
 
-
 create_gn_args() {
     # gn can be configured to cross-compile skia and its tools
     # It is important to set the target_cpu to guarantee the intended target
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index eaaee5e6932..82842aee45b 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -40,7 +40,6 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     BUILD_VK="ON"
     GCC_ARCH="aarch64-linux-gnu"
     KERNEL_ARCH="arm64"
-    SKQP_ARCH="arm64"
     DEFCONFIG="arch/arm64/configs/defconfig"
     DEVICE_TREES="rk3399-gru-kevin.dtb"
     DEVICE_TREES+=" meson-g12b-a311d-khadas-vim3.dtb"
@@ -63,7 +62,6 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     BUILD_VK="OFF"
     GCC_ARCH="arm-linux-gnueabihf"
     KERNEL_ARCH="arm"
-    SKQP_ARCH="arm"
     DEFCONFIG="arch/arm/configs/multi_v7_defconfig"
     DEVICE_TREES="rk3288-veyron-jaq.dtb"
     DEVICE_TREES+=" sun8i-h3-libretech-all-h3-cc.dtb"
@@ -89,7 +87,6 @@ else
     BUILD_VK="ON"
     GCC_ARCH="x86_64-linux-gnu"
     KERNEL_ARCH="x86_64"
-    SKQP_ARCH="x64"
     DEFCONFIG="arch/x86/configs/x86_64_defconfig"
     DEVICE_TREES=""
     KERNEL_IMAGE_NAME="bzImage"