diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 010100588c..7ef369d4c4 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -8,3 +8,4 @@ ed2117e6d6826a98b6988e2f18c0c34e408563b6
 a71cad2dd6ace5741a754e2ca7daacd4bb094e0e
 2c2402ed59c91164eaff46dee0f79386b7347e9e
 05b7c571544c3bcb153fce67d12b9ac48947fc2d
+6f705190cfb6f51cfeb8eacec61ca5cc44625d13
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f44ebb87ec..4439fea58d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -235,7 +235,7 @@ 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
     env:
       BOUT_TEST_DOWNLOAD_FLAGS: --retry-on-http-error=502,503,504 --tries 3
     steps:
@@ -250,21 +250,21 @@ jobs:
           # If we update the test, invalidate the cache
           key: zenodo-data-${{ hashFiles('tests/integrated/test-fci-mpi/CMakeLists.txt') }}
 
-      - name: Build minimal CUDA 12.2 @ GCC9.4.0 @ Ubuntu 20.04
+      - name: Build minimal CUDA 12.6 @ GCC11 @ Ubuntu 22.04
         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=g++ \
             -DBOUT_ENABLE_RAJA=on \
             -DBOUT_ENABLE_UMPIRE=on \
             -DBOUT_ENABLE_CUDA=on \
             -DCMAKE_CUDA_ARCHITECTURES=80 \
             -DCUDA_ARCH=compute_80,code=sm_80 \
             -DBOUT_ENABLE_WARNINGS=off \
-            -DBOUT_USE_SYSTEM_FMT=on
+           -DBOUT_ENABLE_WARNINGS=off
           cd build
           make -j 4
diff --git a/include/bout/field3d.hxx b/include/bout/field3d.hxx
index a75e38df36..6e794a83a8 100644
--- a/include/bout/field3d.hxx
+++ b/include/bout/field3d.hxx
@@ -567,7 +567,7 @@ void checkData(const Field3D& f, const std::string& region = "RGN_NOBNDRY");
 /// Ignored with disabled CHECK; Throw an exception if \p f is not
 /// allocated or if any elements are non-finite (for CHECK > 2)
 inline void checkData(const Field3D& UNUSED(f),
-                      const std::string& UNUSED(region) = "RGN_NOBNDRY"){};
+                      const std::string& UNUSED(region) = "RGN_NOBNDRY") {};
 #endif
 
 /// Fourier filtering, removes all except one mode
diff --git a/src/mesh/parallel/fci.cxx b/src/mesh/parallel/fci.cxx
index 08e56584e1..7832e48fc6 100644
--- a/src/mesh/parallel/fci.cxx
+++ b/src/mesh/parallel/fci.cxx
@@ -309,8 +309,8 @@ void FCITransform::checkInputGrid() {
             "to generate metric components for FCITransform. Should be 'fci'.");
     }
   } // else: parallel_transform variable not found in grid input, indicates older input
-    //       file or grid from options so must rely on the user having ensured the type is
-    //       correct
+  //       file or grid from options so must rely on the user having ensured the type is
+  //       correct
 }
 
 void FCITransform::calcParallelSlices(Field3D& f) {
diff --git a/src/mesh/parallel/fci.hxx b/src/mesh/parallel/fci.hxx
index 1a02f558e1..74922bd0e5 100644
--- a/src/mesh/parallel/fci.hxx
+++ b/src/mesh/parallel/fci.hxx
@@ -73,7 +73,7 @@ public:
   FCITransform() = delete;
   FCITransform(Mesh& mesh, const Coordinates::FieldMetric& dy, bool zperiodic = true,
                Options* opt = nullptr)
-    : ParallelTransform(mesh, opt), R{&mesh}, Z{&mesh} {
+      : ParallelTransform(mesh, opt), R{&mesh}, Z{&mesh} {
 
     // check the coordinate system used for the grid data source
     FCITransform::checkInputGrid();