diff --git a/scripts/ci/images-v2/Dockerfile.ci-spack-el8-base b/scripts/ci/images-v2/Dockerfile.ci-spack-el8-base
index 12b005282d..f5f4edeafb 100644
--- a/scripts/ci/images-v2/Dockerfile.ci-spack-el8-base
+++ b/scripts/ci/images-v2/Dockerfile.ci-spack-el8-base
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=almalinux/almalinux:8
+ARG BASE_IMAGE=almalinux:8
 FROM $BASE_IMAGE
 
 RUN dnf upgrade -y && \
diff --git a/scripts/ci/images-v2/Dockerfile.ci-spack-el8-cuda-base b/scripts/ci/images-v2/Dockerfile.ci-spack-el8-cuda-base
new file mode 100644
index 0000000000..6f271fc024
--- /dev/null
+++ b/scripts/ci/images-v2/Dockerfile.ci-spack-el8-cuda-base
@@ -0,0 +1,14 @@
+ARG BASE_IMAGE=ornladios/adios2:ci-spack-el8-base
+FROM $BASE_IMAGE
+
+RUN yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo
+
+# Install the gcc fortran compiler missing from the base image
+RUN dnf install -y gcc-gfortran cuda && \
+    dnf clean all
+
+# Add the compilers to spack
+RUN . /opt/spack/share/spack/setup-env.sh && \
+    spack compiler rm --scope system gcc && \
+    spack compiler add --scope system && \
+    spack config --scope system add "packages:all:compiler:[gcc]"
diff --git a/scripts/ci/images-v2/Dockerfile.ci-spack-el8-leaf b/scripts/ci/images-v2/Dockerfile.ci-spack-el8-leaf
index 2a62614a56..a0e8dd0f62 100644
--- a/scripts/ci/images-v2/Dockerfile.ci-spack-el8-leaf
+++ b/scripts/ci/images-v2/Dockerfile.ci-spack-el8-leaf
@@ -1,7 +1,7 @@
 # vim: ft=dockerfile
 ARG COMPILER_IMG_BASE
 
-FROM almalinux/almalinux:8 AS builder
+FROM almalinux:8 AS builder
 ARG COMPILER_IMG_BASE
 
 WORKDIR /root
diff --git a/scripts/ci/images-v2/build-base.sh b/scripts/ci/images-v2/build-base.sh
index 19a81e99cf..74c0e017d5 100755
--- a/scripts/ci/images-v2/build-base.sh
+++ b/scripts/ci/images-v2/build-base.sh
@@ -5,7 +5,7 @@ source "${BASE_DIR}/build-functions.sh"
 
 message1 "Building ci-spack-el8 base image"
 if ! build_squash \
-  almalinux/almalinux:8 \
+  almalinux:8 \
   ornladios/adios2:ci-spack-el8-base \
   Dockerfile.ci-spack-el8-base
 then
diff --git a/scripts/ci/images-v2/build-cuda.sh b/scripts/ci/images-v2/build-cuda.sh
index b5444e5bac..4fd5125b3f 100755
--- a/scripts/ci/images-v2/build-cuda.sh
+++ b/scripts/ci/images-v2/build-cuda.sh
@@ -4,10 +4,20 @@ set -ex
 BASE_DIR=$(dirname $(readlink -f ${BASH_SOURCE}))
 source "${BASE_DIR}/build-functions.sh"
 
+message1 "Building cuda base image"
+if ! build_squash \
+  ornladios/adios2:ci-spack-el8-base \
+  ornladios/adios2:ci-spack-el8-cuda-base \
+  Dockerfile.ci-spack-el8-cuda-base
+then
+  echo "Error: Failed to build cuda base image"
+  exit 3
+fi
+
 message1 "Building ci-spack-el8 leaf image"
-build_conf=gcc8
+build_conf=cuda
 if ! build_squash \
-    ornladios/adios2:ci-spack-el8-gcc8-base \
+    ornladios/adios2:ci-spack-el8-cuda-base \
     ornladios/adios2:ci-spack-el8-cuda-serial \
     Dockerfile.ci-spack-el8-leaf \
     "--build-arg=COMPILER_IMG_BASE=${build_conf}
diff --git a/scripts/ci/images-v2/build.sh b/scripts/ci/images-v2/build.sh
index b82cbed7ad..c269a0a633 100755
--- a/scripts/ci/images-v2/build.sh
+++ b/scripts/ci/images-v2/build.sh
@@ -71,7 +71,7 @@ if [ $enable_base -eq 1 ]
 then
   message1 "Building ci base image"
   if ! build_squash \
-    almalinux/almalinux:8 \
+    almalinux:8 \
     ornladios/adios2:ci-spack-el8-base \
     Dockerfile.ci-spack-el8-base
   then