diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2ed640a5e..a49eeb18ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -129,7 +129,7 @@ jobs:
   check-code-formatting:
     name: Check code formatting
     runs-on: ubuntu-latest
-    container: openrct2/openrct2-build:22-format
+    container: openrct2/openrct2-build:23-format
     defaults:
       run:
         shell: sh
@@ -315,7 +315,7 @@ jobs:
     name: Windows (${{ matrix.platform_name }}) using mingw
     runs-on: ubuntu-latest
     needs: [check-code-formatting, build_variables]
-    container: openrct2/openrct2-build:22-mingw
+    container: openrct2/openrct2-build:23-mingw
     strategy:
       fail-fast: false
       matrix:
@@ -453,12 +453,17 @@ jobs:
           - platform: x86_64
             distro: Ubuntu
             release: noble
-            image: openrct2/openrct2-build:22-noble
+            image: openrct2/openrct2-build:23-noble
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments"
           - platform: x86_64
             distro: Debian
             release: bookworm
-            image: openrct2/openrct2-build:22-bookworm
+            image: openrct2/openrct2-build:23-bookworm
+            build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
+          - platform: x86_64
+            distro: Debian
+            release: trixie
+            image: openrct2/openrct2-build:23-trixie
             build_flags: -DCMAKE_POSITION_INDEPENDENT_CODE=on -DCMAKE_CXX_FLAGS="-g -gz -fno-var-tracking-assignments" -DWITH_TESTS=off
     steps:
       - name: Checkout
@@ -466,7 +471,7 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.18
         with:
-          key: linux-${{ matrix.platform }}-${{ matrix.distro }}
+          key: linux-${{ matrix.platform }}-${{ matrix.distro }}-${{ matrix.release }}
       - name: Get pre-reqs
         run: . scripts/setenv && get-discord-rpc
       - name: Install GCC problem matcher
@@ -489,7 +494,7 @@ jobs:
     name: Ubuntu Linux (AppImage, x86_64)
     runs-on: ubuntu-latest
     needs: [check-code-formatting, build_variables]
-    container: openrct2/openrct2-build:22-jammy
+    container: openrct2/openrct2-build:23-jammy
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -544,7 +549,7 @@ jobs:
     name: Ubuntu Linux (noble, debug, [http, network, flac, vorbis OpenGL] disabled) using clang
     runs-on: ubuntu-latest
     needs: [check-code-formatting, build_variables]
-    container: openrct2/openrct2-build:22-noble
+    container: openrct2/openrct2-build:23-noble
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -560,14 +565,14 @@ jobs:
     name: Ubuntu Linux (debug) using clang, coverage enabled
     runs-on: ubuntu-latest
     needs: [check-code-formatting, build_variables]
-    container: openrct2/openrct2-build:22-noble
+    container: openrct2/openrct2-build:23-noble
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.18
         with:
-          key: linux-clang
+          key: linux-clang-tests
       - name: Install GCC problem matcher
         uses: ammaraskar/gcc-problem-matcher@master
       - name: Build OpenRCT2
@@ -601,7 +606,7 @@ jobs:
     name: Android
     runs-on: ubuntu-latest
     needs: [check-code-formatting, build_variables]
-    container: openrct2/openrct2-build:22-android
+    container: openrct2/openrct2-build:23-android
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -634,7 +639,7 @@ jobs:
     name: Emscripten
     runs-on: ubuntu-latest
     needs: [check-code-formatting, build_variables]
-    container: openrct2/openrct2-build:22-emscripten
+    container: openrct2/openrct2-build:23-emscripten
     steps:
       - name: Checkout
         uses: actions/checkout@v4