diff --git a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml
index 92ed3dfd..25625050 100644
--- a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 20.04
       COMPILER_TYPE: clang
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml
index fafafa6c..9dea7a98 100644
--- a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 20.04
       COMPILER_TYPE: clang
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml
index a7c66bc2..f84c1ed8 100644
--- a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 20.04
       COMPILER_TYPE: clang
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml
index c7dd6436..86cda99c 100644
--- a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 22.04
       COMPILER_TYPE: clang
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml
index 027d8d67..d059838b 100644
--- a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 22.04
       COMPILER_TYPE: clang
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml
index 646f3c3c..e53a83c7 100644
--- a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 18.04
       COMPILER_TYPE: clang
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml
index c1496111..a829c34a 100644
--- a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 18.04
       COMPILER_TYPE: clang
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml
index 03c54cad..ff2486ee 100644
--- a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 20.04
       COMPILER_TYPE: gnu
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml
index 546543d6..540f19cb 100644
--- a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 18.04
       COMPILER_TYPE: gnu
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml
index 8aef669e..6f41183a 100644
--- a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 20.04
       COMPILER_TYPE: gnu
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml
index f700d39f..97acdeac 100644
--- a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml
+++ b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      REPO: lifflander1/checkpoint
+      REPO: lifflander1/vt
       ARCH: amd64
       UBUNTU: 20.04
       COMPILER_TYPE: nvidia
@@ -54,22 +54,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) ubuntu-cpp
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run ubuntu-cpp
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push ubuntu-cpp
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile
deleted file mode 100644
index 92f087f3..00000000
--- a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile
+++ /dev/null
@@ -1,72 +0,0 @@
-
-ARG arch=amd64
-ARG distro=18.04
-FROM ${arch}/ubuntu:${distro} AS base
-
-ARG proxy=""
-ARG compiler=clang-7
-
-ENV https_proxy=${proxy} \
-    http_proxy=${proxy}
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-    ca-certificates \
-    curl \
-    less \
-    git \
-    wget \
-    ${compiler} \
-    zlib1g \
-    zlib1g-dev \
-    ninja-build \
-    unzip \
-    valgrind \
-    make-guile \
-    libomp5 \
-    libunwind-dev \
-    ccache && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN ln -s \
-    "$(which $(echo ${compiler}  | cut -d- -f1)++-$(echo ${compiler}  | cut -d- -f2))" \
-    /usr/bin/clang++
-
-ENV CC=${compiler} \
-    CXX=clang++
-
-COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4 ${arch}
-
-COPY ./ci/deps/mpich.sh mpich.sh
-RUN ./mpich.sh 3.3.2 -j4
-
-ENV PATH=/cmake/bin/:$PATH
-ENV LESSCHARSET=utf-8
-
-COPY ./ci/deps/gtest.sh gtest.sh
-RUN ./gtest.sh 1.8.1 /pkgs
-ENV GTEST_ROOT=/pkgs/gtest/install
-
-COPY ./ci/deps/kokkos.sh kokkos.sh
-RUN ./kokkos.sh 4.1.00 /pkgs 0
-ENV KOKKOS_ROOT=/pkgs/kokkos/install
-
-COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh
-RUN ./kokkos-kernels.sh 4.1.00 /pkgs
-ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install
-
-ENV MPI_EXTRA_FLAGS="" \
-    CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \
-    PATH=/usr/lib/ccache/:$PATH \
-    CMAKE_EXE_LINKER_FLAGS="-pthread"
-
-FROM base AS build
-COPY . /checkpoint
-RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
-
-FROM build AS test
-RUN /checkpoint/ci/test_cpp.sh /checkpoint /build
diff --git a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
deleted file mode 100644
index 218fbeea..00000000
--- a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile
+++ /dev/null
@@ -1,80 +0,0 @@
-
-ARG arch=amd64
-ARG distro=18.04
-FROM ${arch}/ubuntu:${distro} AS base
-
-ARG proxy=""
-ARG compiler=gcc-8
-
-ENV https_proxy=${proxy} \
-    http_proxy=${proxy}
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-    g++-$(echo ${compiler} | cut -d- -f2) \
-    ca-certificates \
-    less \
-    curl \
-    git \
-    wget \
-    ${compiler} \
-    zlib1g \
-    zlib1g-dev \
-    unzip \
-    ninja-build \
-    valgrind \
-    make-guile \
-    libomp5 \
-    ccache && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN ln -s \
-    "$(which g++-$(echo ${compiler}  | cut -d- -f2))" \
-    /usr/bin/g++
-
-RUN ln -s \
-    "$(which gcc-$(echo ${compiler}  | cut -d- -f2))" \
-    /usr/bin/gcc
-
-ENV CC=gcc \
-    CXX=g++
-
-COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4 ${arch}
-
-COPY ./ci/deps/mpich.sh mpich.sh
-RUN ./mpich.sh 3.3.2 -j4
-
-ENV PATH=/cmake/bin/:$PATH
-ENV LESSCHARSET=utf-8
-
-COPY ./ci/deps/gtest.sh gtest.sh
-RUN ./gtest.sh 1.8.1 /pkgs
-ENV GTEST_ROOT=/pkgs/gtest/install
-
-COPY ./ci/deps/kokkos.sh kokkos.sh
-RUN ./kokkos.sh 4.1.00 /pkgs 1
-ENV KOKKOS_ROOT=/pkgs/kokkos/install
-
-COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh
-RUN ./kokkos-kernels.sh 4.1.00 /pkgs
-ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install
-
-ENV MPI_EXTRA_FLAGS="" \
-    PATH=/usr/lib/ccache/:$PATH
-
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-    lcov && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-FROM base AS build
-COPY . /checkpoint
-RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
-
-FROM build AS test
-RUN /checkpoint/ci/test_cpp.sh /checkpoint /build
diff --git a/ci/docker/ubuntu-20.04-clang-cpp.dockerfile b/ci/docker/ubuntu-20.04-clang-cpp.dockerfile
deleted file mode 120000
index 6484110b..00000000
--- a/ci/docker/ubuntu-20.04-clang-cpp.dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu-18.04-clang-cpp.dockerfile
\ No newline at end of file
diff --git a/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile
deleted file mode 120000
index 2b4c68e7..00000000
--- a/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu-18.04-gnu-cpp.dockerfile
\ No newline at end of file
diff --git a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile b/ci/docker/ubuntu-22.04-clang-cpp.dockerfile
deleted file mode 100644
index 830381dd..00000000
--- a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile
+++ /dev/null
@@ -1,74 +0,0 @@
-
-ARG arch=amd64
-ARG distro=22.04
-FROM ${arch}/ubuntu:${distro} AS base
-
-ARG proxy=""
-ARG compiler=clang-13
-
-ENV https_proxy=${proxy} \
-    http_proxy=${proxy}
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -y -q && \
-    apt-get install -y -q --no-install-recommends \
-    ca-certificates \
-    curl \
-    less \
-    git \
-    wget \
-    ${compiler} \
-    zlib1g \
-    zlib1g-dev \
-    ninja-build \
-    unzip \
-    valgrind \
-    make-guile \
-    libomp5 \
-    libunwind-dev \
-    ccache && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN ln -s \
-    "$(which $(echo ${compiler}  | cut -d- -f1)++-$(echo ${compiler}  | cut -d- -f2))" \
-    /usr/bin/clang++
-
-ENV CC=${compiler} \
-    CXX=clang++
-
-ARG arch
-
-COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.23.4 ${arch}
-
-COPY ./ci/deps/mpich.sh mpich.sh
-RUN ./mpich.sh 3.3.2 -j4
-
-ENV PATH=/cmake/bin/:$PATH
-ENV LESSCHARSET=utf-8
-
-COPY ./ci/deps/gtest.sh gtest.sh
-RUN ./gtest.sh 1.8.1 /pkgs
-ENV GTEST_ROOT=/pkgs/gtest/install
-
-COPY ./ci/deps/kokkos.sh kokkos.sh
-RUN ./kokkos.sh 4.1.00 /pkgs 0
-ENV KOKKOS_ROOT=/pkgs/kokkos/install
-
-COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh
-RUN ./kokkos-kernels.sh 4.1.00 /pkgs
-ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install
-
-ENV MPI_EXTRA_FLAGS="" \
-    CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \
-    PATH=/usr/lib/ccache/:$PATH \
-    CMAKE_EXE_LINKER_FLAGS="-pthread"
-
-FROM base AS build
-COPY . /checkpoint
-RUN /checkpoint/ci/build_cpp.sh /checkpoint /build
-
-FROM build AS test
-RUN /checkpoint/ci/test_cpp.sh /checkpoint /build
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c49b134..02b0f5cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -113,18 +113,7 @@ services:
   # Ubuntu gcc-8 debug build:
   #   docker-compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp
   ubuntu-cpp:
-    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp
-    build:
-      context: .
-      target: base
-      dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-cpp.dockerfile
-      cache_from:
-        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp
-      args: &default-args
-        arch: ${ARCH}
-        proxy: ${PROXY}
-        compiler: ${COMPILER}
-        distro: ${UBUNTU}
+    image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp
     ulimits: &ulimits
       core: ${ULIMIT_CORE}
     environment:
@@ -145,7 +134,11 @@ services:
       dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-cpp.dockerfile
       cache_from:
         - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp
-      args: *default-args
+      args: &default-args
+        arch: ${ARCH}
+        proxy: ${PROXY}
+        compiler: ${COMPILER}
+        distro: ${UBUNTU}
     ulimits: *ulimits
     environment:
       <<: [*ccache, *checkpointopts]
diff --git a/scripts/check_containers.sh b/scripts/check_containers.sh
deleted file mode 100755
index 2bd8fb9c..00000000
--- a/scripts/check_containers.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-# Decide whether we should pull or build the Docker images in CI.
-# This is consistent with GitHub (actions/checkout@v3).
-
-diff_latest() {
-  printf "Files modified in the latest pull request:\n" >&2
-  local base_ref
-  if [[ $(git branch --show-current) == "develop" ]]
-  then
-    base_ref=$(git log --skip=1 -1 --merges --pretty=format:%H)
-  else
-    base_ref="origin/develop"
-  fi
-  git diff --name-only "$base_ref"...HEAD
-}
-
-# Check if there were any dockerfiles modified in the latest pull request.
-# Print the modified files list to stderr as well.
-if diff_latest | tee >(cat >&2) | grep -i -q dockerfile
-then
-    echo "docker compose build --pull"
-else
-    echo "docker compose pull --ignore-pull-failures"
-fi
diff --git a/scripts/workflow-template.yml b/scripts/workflow-template.yml
index b274a8dd..88941ede 100644
--- a/scripts/workflow-template.yml
+++ b/scripts/workflow-template.yml
@@ -47,22 +47,11 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: Prepare the base Docker image
-      shell: bash
-      run: $(./scripts/check_containers.sh) [% docker_target %]
-    - name: Build the Docker image
+    - name: Build and Test
       run: docker compose run [% docker_target %]
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - name: Docker Push Base Image
-      if: ${{ success() && github.ref == 'refs/heads/develop' }}
-      continue-on-error: true
-      shell: bash
-      run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} \
-                     -p ${{ secrets.DOCKER_PASSWORD }}
-        docker compose push [% docker_target %]
-    - name: Zip up CMake output
+    - name: Collect logs
       run: |
         zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log
         zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log
diff --git a/scripts/workflows.ini b/scripts/workflows.ini
index c240ea30..0686d6c1 100644
--- a/scripts/workflows.ini
+++ b/scripts/workflows.ini
@@ -12,7 +12,7 @@ build_type = release
 
 ulimit_core = 0
 code_coverage = 0
-repo = lifflander1/checkpoint
+repo = lifflander1/vt
 arch = amd64
 is_ubuntu = 1
 distro = 18.04