diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bbb74cb39..398d1bf1e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -230,14 +230,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - target: aarch64-debian-bullseye
-            platform: linux_aarch64-debian-bullseye
-            image: debian:bullseye
-            runs_on: buildjet-8vcpu-ubuntu-2204-arm
-          - target: x86_64-debian-bullseye
-            platform: linux_x86_64-debian-bullseye
-            image: debian:bullseye
-            runs_on: buildjet-8vcpu-ubuntu-2204
           - target: aarch64-debian-bookworm
             platform: linux_aarch64-debian-bookworm
             image: debian:bookworm
@@ -283,17 +275,6 @@ jobs:
               wget \
               zlib1g-dev
 
-      - name: Update CMake for bullseye
-        if: ${{ matrix.image  == 'debian:bullseye' }}
-        run: |
-          sudo apt-get install -y software-properties-common
-          apt-add-repository -y 'deb https://archive.debian.org/debian bullseye-backports main'
-
-          apt-get update
-          apt-get -y install cmake
-
-          apt-get -y --no-install-recommends install -t bullseye-backports cmake
-
       - name: Setup build directory
         run: mkdir builds
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 405a44667..11ae53b66 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,8 @@ jobs:
   test_ubuntu:
     if: github.repository_owner == 'viamrobotics'
     runs-on: ubuntu-latest
-    container: ghcr.io/viamrobotics/cpp-base:bullseye-amd64
+    container:
+      image: debian:bookworm
     strategy:
       fail-fast: false
       matrix:
@@ -24,6 +25,48 @@ jobs:
           - BUILD_SHARED: OFF
     steps:
       - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get -y dist-upgrade
+          DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
+              build-essential \
+              ca-certificates \
+              cmake \
+              curl \
+              doxygen \
+              g++ \
+              gdb \
+              git \
+              gnupg \
+              gpg \
+              less \
+              libboost-all-dev \
+              libc-ares-dev \
+              libgrpc++-dev \
+              libprotobuf-dev \
+              libre2-dev \
+              libssl-dev \
+              ninja-build \
+              pkg-config \
+              protobuf-compiler-grpc \
+              software-properties-common \
+              sudo \
+              wget \
+              zlib1g-dev
+
+          bash -c 'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add -'
+          apt-add-repository -y 'deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-15 main'
+          apt-add-repository -y 'deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-15 main'
+          apt-get update
+          DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install -t llvm-toolchain-bookworm-15 \
+            clang-15 \
+            clang-tidy-15 \
+            clang-format
+
+
+
       - name: cmake
         run: |
           mkdir build
@@ -35,13 +78,16 @@ jobs:
             -DVIAMCPPSDK_BUILD_EXAMPLES=ON \
             -DVIAMCPPSDK_CLANG_TIDY=${{ inputs.no-tidy && 'OFF' || 'ON' }} \
             -DVIAMCPPSDK_SANITIZED_BUILD=${{ matrix.BUILD_SHARED }}
+
       - name: build
         run: |
           cmake --build build --target install
           cmake --install build
+
       - name: test
         working-directory: build
         run: ../etc/docker/tests/run_test.sh
+
   test_windows:
     if: github.repository_owner == 'viamrobotics'
     runs-on: windows-latest