diff --git a/bot/build.sh b/bot/build.sh
index 7b414d18..adaa7ddc 100755
--- a/bot/build.sh
+++ b/bot/build.sh
@@ -246,9 +246,9 @@ COMMON_ARGS+=("--pass-through" "--contain")
 # make sure to use the same parent dir for storing tarballs of tmp
 PREVIOUS_TMP_DIR=${PWD}/previous_tmp
 
-# Skip CUDA installation for riscv.eessi.io
-if [[ "${REPOSITORY_NAME}" == "riscv.eessi.io" ]]; then
-    echo "bot/build.sh: disabling CUDA installation for RISC-V repository (${REPOSITORY_NAME})"
+# Skip CUDA installation for RISC-V builds
+if [[ "${REPOSITORY_NAME}" == "riscv.eessi.io" || "${EESSI_SOFTWARE_SUBDIR_OVERRIDE}" =~ ^riscv64/.* ]]; then
+    echo "bot/build.sh: disabling CUDA installation for RISC-V builds"
     INSTALL_SCRIPT_ARGS+=("--skip-cuda-install")
 fi
 
diff --git a/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh b/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh
index 34027bf2..3ac19226 100755
--- a/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh
+++ b/scripts/gpu_support/nvidia/install_cuda_and_libraries.sh
@@ -77,6 +77,13 @@ done
 # Make sure EESSI is initialised
 check_eessi_initialised
 
+# Check if this script is run on a supported architecture,
+# CUDA on RISC-V is not supported yet.
+[[ -z "${EESSI_CPU_FAMILY}" ]] && export EESSI_CPU_FAMILY=$(uname -m)
+if [[ "${EESSI_CPU_FAMILY}" != "x86_64" && "${EESSI_CPU_FAMILY}" != "aarch64" ]]; then
+    fatal_error "CUDA does not support CPU family: $EESSI_CPU_FAMILY"
+fi
+
 # we need a directory we can use for temporary storage
 if [[ -z "${TEMP_DIR}" ]]; then
     tmpdir=$(mktemp -d)