diff --git a/base/Dockerfile b/base/Dockerfile
index 29761f2..26bf5c4 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -211,6 +211,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
         git \
+        zlib1g-dev \
+        libssl-dev \
+    # breakpad's build tools require python2 to be available as python on the path
+    && git clone https://github.com/pyenv/pyenv.git .pyenv \
+    && export PYENV_ROOT="$(pwd)/.pyenv" \
+    && export PATH="$PYENV_ROOT/bin:$PATH" \
+    && eval "$(pyenv init --path)" \
+    && pyenv install 2.7 \
+    && pyenv global 2.7 \
     # Fetch and activate depot_tools
     && cd /root \
     && git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git \
@@ -233,7 +242,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         /tmp/* \
         breakpad \
         depot_tools \
+        .pyenv \
     && apt-get autoremove -y \
         git \
+        zlib1g-dev \
+        libssl-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /var/log/dpkg.log /var/log/apt
diff --git a/toolchain/Dockerfile b/toolchain/Dockerfile
index 9b004a4..336fbe9 100644
--- a/toolchain/Dockerfile
+++ b/toolchain/Dockerfile
@@ -1,5 +1,5 @@
 # Essential cross-compiling build tools for the reMarkable
-FROM debian:unstable-20220125-slim
+FROM debian:unstable-20230703-slim
 ARG NGCONFIG="arm-remarkable-linux-gnueabihf"
 ARG CHOST="arm-linux-gnueabihf"