diff --git a/ubuntu/cuda/.uptodate-ignore b/ubuntu/cuda/.uptodate-ignore
deleted file mode 100644
index e69de29..0000000
diff --git a/ubuntu/cuda/Dockerfile b/ubuntu/cuda/Dockerfile
index 147fbb0..7b5777a 100644
--- a/ubuntu/cuda/Dockerfile
+++ b/ubuntu/cuda/Dockerfile
@@ -1,22 +1,26 @@
-ARG gcc_version
-FROM ghcr.io/llnl/radiuss:gcc-$gcc_version
+ARG ubuntu_version
+FROM ghcr.io/llnl/radiuss:gcc-9-ubuntu-${ubuntu_version}
 
-# Install llvm with spack
 ARG cuda_version
 ENV cuda_version=$cuda_version
 
+USER root
+
+ENV DEBIAN_FRONTEND noninteractive
+
 RUN \
-    sudo apt-get -qq update \
-    && sudo apt-get -qq install -y --no-install-recommends \
-        clang-${llvm_version} clang-format-${llvm_version} llvm-${llvm_version} \
-    && sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${llvm_version} 100 \
-    && sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${llvm_version} 100 \
-    && sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${llvm_version} 100 \
-    && sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${llvm_version} 100 \
-    && sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${llvm_version} 100 \
-    && sudo update-alternatives --install /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${llvm_version} 100 \
-    && sudo rm -rf /var/lib/apt/lists/* \
-    && sudo apt-get clean
+    wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin \
+    && mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 \
+    && apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub  \
+    && add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" \
+    && apt-get -qq update \
+    && apt-get -qq install -y --no-install-recommends cuda-${cuda_version} \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
     
 USER radiuss
-WORKDIR /home/radiuss
\ No newline at end of file
+
+RUN echo 'export PATH=/usr/local/cuda/bin:$PATH' >> ~/.bashrc \
+    && echo 'export LD_LIBRARY_PATH=/usr/local/cuda/lib64:$LD_LIBRARY_PATH' >> ~/.bashrc
+
+WORKDIR /home/radiuss
diff --git a/ubuntu/cuda/uptodate.yaml b/ubuntu/cuda/uptodate.yaml
index 29b5e30..949b716 100644
--- a/ubuntu/cuda/uptodate.yaml
+++ b/ubuntu/cuda/uptodate.yaml
@@ -1,17 +1,35 @@
 dockerbuild:
+  container_basename: radiuss
+
   matrix:
     cuda_version:
-       - "11.0.3"
-       - "11.1.1"
-       - "11.2.2"
-       - "11.3.1"
-       - "11.4.0"
+       - "11-0"
+       - "11-1"
+       - "11-2"
+       - "11-3"
+       - "11-4"
+       - "11-5"
+       - "11-6"
+       - "11-7"
+       - "11-8"
+       - "12-0"
+       - "12-1"
+       - "12-2"
+       - "12-3"
     ubuntu_version:
        - "20.04"
        - "20.04"
        - "20.04"
        - "20.04"
        - "20.04"
+       - "20.04"
+       - "20.04"
+       - "20.04"
+       - "20.04"
+       - "20.04"
+       - "20.04"
+       - "20.04"
+       - "20.04"
        
   build_args:
     cuda_version: