diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0b510c48e8..921997299d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -8,6 +8,7 @@ on:
       # Add your branch here if you want containers for it
       - db-WIP
       - docker-ci
+  workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 82f3d6aea0..f1b1a6ce9f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -216,21 +216,21 @@ jobs:
   CUDA:
     timeout-minutes: 60
     runs-on: ubuntu-latest
-    container: ghcr.io/ggeorgakoudis/boutdev-cuda:latest
+    container: ghcr.io/boutproject/bout-container-base:ci-cuda
 
     steps:
       - uses: actions/checkout@v6
         with:
           submodules: true
-      - name: Build minimal CUDA 12.2 @ GCC9.4.0 @ Ubuntu 20.04
+      - name: Build BOUT++ with CUDA 12.6
         run: |
-          . /spack/share/spack/setup-env.sh
-          spack env activate -p /spack-env
+          . /usr/local/bin/bout-env.bash
           git config --global --add safe.directory $GITHUB_WORKSPACE
           rm -rf build
           cmake -S $GITHUB_WORKSPACE -B build \
             -DCMAKE_C_COMPILER=gcc \
             -DCMAKE_CXX_COMPILER=g++ \
+            -DCMAKE_CUDA_HOST_COMPILER=gcc \
             -DBOUT_ENABLE_RAJA=on \
             -DBOUT_ENABLE_UMPIRE=on \
             -DBOUT_ENABLE_CUDA=on \