diff --git a/src/raspbian/10/crossdeps/arm32v7/Dockerfile b/src/raspbian/12/crossdeps/arm32v7/Dockerfile
similarity index 96%
rename from src/raspbian/10/crossdeps/arm32v7/Dockerfile
rename to src/raspbian/12/crossdeps/arm32v7/Dockerfile
index b93569f8c..eb9603abd 100644
--- a/src/raspbian/10/crossdeps/arm32v7/Dockerfile
+++ b/src/raspbian/12/crossdeps/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu.azurecr.io/ubuntu:18.04
+FROM ubuntu.azurecr.io/ubuntu:22.04
 
 # Install the base toolchain we need to build anything (clang, cmake, make and the like).
 RUN apt-get update \
diff --git a/src/raspbian/10/helix/arm32v6/Dockerfile b/src/raspbian/12/helix/arm32v6/Dockerfile
similarity index 87%
rename from src/raspbian/10/helix/arm32v6/Dockerfile
rename to src/raspbian/12/helix/arm32v6/Dockerfile
index ffc9934d5..d87e50885 100644
--- a/src/raspbian/10/helix/arm32v6/Dockerfile
+++ b/src/raspbian/12/helix/arm32v6/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs
 
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:raspbian-10-crossdeps as builder
+FROM --platform=linux/arm/v7 mcr.microsoft.com/dotnet-buildtools/prereqs:raspbian-12-crossdeps as builder
 
 ARG ROOTFS_DIR
 
@@ -9,7 +9,7 @@ RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
     git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
 
 # Build the rootfs
-RUN /scripts/eng/common/cross/build-rootfs.sh armv6 raspbian --skipunmount
+RUN /scripts/eng/common/cross/build-rootfs.sh armv6 bookworm lldb15 --skipunmount
 
 FROM scratch
 ARG ROOTFS_DIR
@@ -45,8 +45,10 @@ RUN apt-get update && \
         libunwind8 \
         locales \
         locales-all \
+        pkg-config \
         python3-dev \
         python3-pip \
+        rustc \
         sudo \
         tzdata \
         unzip \
@@ -60,7 +62,7 @@ ENV LANG=en_US.utf8
 RUN ln -sf /usr/bin/python3 /usr/bin/python && \
     pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
     export CRYPTOGRAPHY_DONT_BUILD_RUST=1 && \
-    pip install ./helix_scripts-*-py3-none-any.whl
+    pip install ./helix_scripts-*-py3-none-any.whl --break-system-packages
 
 # Create helixbot user and give rights to sudo without password
 # (we use two users here to ensure volume mounting works with two possible UIDs of the host UID)
diff --git a/src/raspbian/manifest.json b/src/raspbian/manifest.json
index f29c5bd74..b31e8bc95 100644
--- a/src/raspbian/manifest.json
+++ b/src/raspbian/manifest.json
@@ -7,15 +7,29 @@
           "platforms": [
             {
               "architecture": "arm",
-              "dockerfile": "src/raspbian/10/crossdeps/arm32v7",
+              "dockerfile": "src/raspbian/12/crossdeps/arm32v7",
               "os": "linux",
-              "osVersion": "buster",
+              "osVersion": "jammy",
               "tags": {
-                "raspbian-10-crossdeps": {}
+                "raspbian-12-crossdeps": {}
               },
               "variant": "v7"
             }
           ]
+        },
+        {
+          "platforms": [
+            {
+              "architecture": "arm",
+              "dockerfile": "src/raspbian/12/helix/arm32v6",
+              "os": "linux",
+              "osVersion": "bookworm",
+              "tags": {
+                "raspbian-12-helix-arm32v6": {}
+              },
+              "variant": "v6"
+            }
+          ]
         }
       ]
     }