diff --git a/ci/config.yaml b/ci/config.yaml
index 2a8e7346..9f3e913d 100644
--- a/ci/config.yaml
+++ b/ci/config.yaml
@@ -68,7 +68,7 @@ setup:
       GCOV: llvm-gcov
     deps:
       packages: !extend [ *apk-packages, clang, clang-dev ]
-      mpich: ['3.3.2', '-j4', '', 'clang', 'clang++']
+      mpich: ['CC=clang', 'CXX=clang++', '3.3.2', '-j4']
 
   # setup from vt
   amd64-ubuntu-20.04-gcc-9-12.2.0-cpp:
@@ -76,14 +76,12 @@ setup:
     env:
       <<: *env
       CC: gcc-9
-      CXX: g++-9
+      CXX: nvcc_wrapper
     # deps and versions to find in vt
     deps:
       packages: !extend [ *apt-packages, gcc-9, g++-9 ]
       cmake: *cmake-args # 3.23.4 in vt but seems to be an error with vtk tiff build because error in Cmake CheckSize.
-      openmpi: *openmpi-args
-      zoltan: *zoltan-args
-      mpich: *mpich-args
+      mpich: ['CC=clang', 'CXX=clang++', '3.3.2', '-j4']
 
   amd64-ubuntu-20.04-gcc-9-11.2.2-cpp:
     label: vt, gcc-9, ubuntu, cuda 11.2, mpich, zoltan
@@ -194,7 +192,7 @@ images:
     dockerfile: ubuntu-cpp-base.dockerfile
     arch: linux/amd64
     base: nvidia/cuda:11.2.2-devel-ubuntu20.04
-    setup: ubuntu-20.04-gcc-9-11.2.2-cpp
+    setup: amd64-ubuntu-20.04-gcc-9-11.2.2-cpp
   
 
   # TODO: add the following
diff --git a/ci/docker/base.dockerfile b/ci/docker/base.dockerfile
index fab10c5f..64dbb45b 100644
--- a/ci/docker/base.dockerfile
+++ b/ci/docker/base.dockerfile
@@ -19,7 +19,7 @@ ARG MPICH_CC
 ARG MPICH_CXX
 
 # Environment
-ENV PATH=/opt/cmake/bin:$PATH
+ENV DOCKER_RUN=1
 ENV CC=$CC
 ENV CXX=$CXX
 ENV MPICH_CC=$MPICH_CC
@@ -28,7 +28,8 @@ ENV GCOV=$GCOV
 ENV CONDA_INSTALL_DIR=/opt/conda
 ENV CONDA_AUTO_ACTIVATE_BASE=false
 ENV VTK_DIR=/opt/vtk/build
-ENV DOCKER_RUN=1
+ENV LESSCHARSET=utf-8
+ENV PATH=/opt/cmake/bin:/opt/nvcc_wrapper/bin:/opt/vtk/bin:$PATH
 
 COPY ci/shared/scripts/setup-${SETUP_ID}.sh setup.sh
 
diff --git a/ci/setup-template.sh b/ci/setup-template.sh
index 881a2960..c70ed477 100644
--- a/ci/setup-template.sh
+++ b/ci/setup-template.sh
@@ -76,7 +76,7 @@ ls -l
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/deps/nvcc-wrapper.sh b/ci/shared/scripts/deps/nvcc-wrapper.sh
new file mode 100644
index 00000000..c6c582f4
--- /dev/null
+++ b/ci/shared/scripts/deps/nvcc-wrapper.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+mkdir -p /opt/nvcc_wrapper/bin
+
+wget https://raw.githubusercontent.com/kokkos/kokkos/master/bin/nvcc_wrapper -P /opt/nvcc_wrapper/bin
+chmod +x /opt/nvcc_wrapper/bin/nvcc_wrapper
\ No newline at end of file
diff --git a/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh b/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh
index 04a9feef..a66036de 100644
--- a/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh
+++ b/ci/shared/scripts/setup-amd64-alpine-clang-13-clang-13-cpp.sh
@@ -74,11 +74,11 @@ wget $SCRIPTS_DEPS_URL/mpich.sh
 chmod u+x *.sh
 ls -l
 ./packages.sh "alpine-sdk" "autoconf" "automake" "binutils-dev" "ccache" "cmake" "dpkg" "libdwarf-dev" "libunwind-dev" "libtool" "linux-headers" "m4" "make" "ninja" "zlib" "zlib-dev" "clang" "clang-dev"
-./mpich.sh "3.3.2" "-j4" "" "clang" "clang++"
+./mpich.sh "CC=clang" "CXX=clang++" "3.3.2" "-j4"
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-11.2.2-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-11.2.2-cpp.sh
index d74a2892..54e026f0 100644
--- a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-11.2.2-cpp.sh
+++ b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-11.2.2-cpp.sh
@@ -76,7 +76,7 @@ ls -l
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-12.2.0-cpp.sh b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-12.2.0-cpp.sh
index 72817cea..1cd0e164 100644
--- a/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-12.2.0-cpp.sh
+++ b/ci/shared/scripts/setup-amd64-ubuntu-20.04-gcc-9-12.2.0-cpp.sh
@@ -70,21 +70,17 @@ mkdir -p $SCRIPTS_INSTALL_DIR/deps
 cd $SCRIPTS_INSTALL_DIR/deps
 wget $SCRIPTS_DEPS_URL/packages.sh
 wget $SCRIPTS_DEPS_URL/cmake.sh
-wget $SCRIPTS_DEPS_URL/openmpi.sh
-wget $SCRIPTS_DEPS_URL/zoltan.sh
 wget $SCRIPTS_DEPS_URL/mpich.sh
 # 2. Install dependency
 chmod u+x *.sh
 ls -l
 ./packages.sh "curl" "jq" "less" "libomp5" "libunwind-dev make-guile" "ninja-build" "valgrind" "zlib1g" "zlib1g-dev" "ccache" "python3" "gcc-9" "g++-9"
 ./cmake.sh "3.30.3"
-./openmpi.sh "v5.0" "5.0.4"
-./zoltan.sh "-j4'" "/trilinos-install"
-./mpich.sh "4.0.2" "-j4"
+./mpich.sh "CC=clang" "CXX=clang++" "3.3.2" "-j4"
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/setup-macos-14-clang-14.sh b/ci/shared/scripts/setup-macos-14-clang-14.sh
index aa628b14..4cc5befd 100644
--- a/ci/shared/scripts/setup-macos-14-clang-14.sh
+++ b/ci/shared/scripts/setup-macos-14-clang-14.sh
@@ -76,7 +76,7 @@ ls -l
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh
index c0ef2a59..465fe75d 100644
--- a/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh
+++ b/ci/shared/scripts/setup-ubuntu-22.04-clang-11-vtk-9.2.2-py-3.all.sh
@@ -90,7 +90,7 @@ ls -l
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh
index 99da5f0f..742d2a1a 100644
--- a/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh
+++ b/ci/shared/scripts/setup-ubuntu-22.04-gcc-11-vtk-9.2.2-py-3.all.sh
@@ -90,7 +90,7 @@ ls -l
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh
index c7bc79d8..4cd35305 100644
--- a/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh
+++ b/ci/shared/scripts/setup-ubuntu-22.04-gcc-12-vtk-9.3.0-py-3.all.sh
@@ -90,7 +90,7 @@ ls -l
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi
 
diff --git a/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh b/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh
index 2f3acab8..0cc87e76 100644
--- a/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh
+++ b/ci/shared/scripts/setup-ubuntu-24.04-gcc-13-vtk-9.3.1-py-3.all.sh
@@ -90,7 +90,7 @@ ls -l
 
 # Remove install scripts
 rm -rf $SCRIPTS_INSTALL_DIR
-if [ DOCKER_RUN == "1" ]; then
+if [ "DOCKER_RUN" == "1" ]; then
     rm -rf /var/lib/apt/lists/*
 fi