diff --git a/taskcluster/docker/base/Dockerfile b/taskcluster/docker/base/Dockerfile
index e16718b19..e39636e17 100644
--- a/taskcluster/docker/base/Dockerfile
+++ b/taskcluster/docker/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Mozilla Release Engineering <release+docker@mozilla.com>"
 
 # Add worker user with the home directory /builds/worker and bash as the default shell.
@@ -28,6 +28,7 @@ RUN apt-get update -qq \
     && apt-get install -y python3 \
                           python3-pip \
                           python3-yaml \
+                          python3-zstandard \
                           locales \
                           git \
                           git-lfs \
@@ -44,8 +45,6 @@ RUN apt-get update -qq \
 
 RUN locale-gen "$LANG"
 
-RUN pip install zstandard
-
 # %include-run-task
 
 # Allow scripts to detect if they are running in docker
diff --git a/taskcluster/docker/test/Dockerfile b/taskcluster/docker/test/Dockerfile
index 9a75824ac..b281e7006 100644
--- a/taskcluster/docker/test/Dockerfile
+++ b/taskcluster/docker/test/Dockerfile
@@ -17,10 +17,9 @@ RUN apt-get update -qq \
       python3.10-venv \
       pkg-config \
       libicu-dev \
+      python3-poetry \
     && apt-get clean
 
-
-RUN pip install poetry
 # we do not run poetry install here because the tracking package is installed from code
 
 # Install taskfile - https://taskfile.dev/
diff --git a/taskcluster/docker/toolchain-build/Dockerfile b/taskcluster/docker/toolchain-build/Dockerfile
index 099efb786..e78d85d72 100644
--- a/taskcluster/docker/toolchain-build/Dockerfile
+++ b/taskcluster/docker/toolchain-build/Dockerfile
@@ -35,9 +35,6 @@ RUN apt-get update -qq \
 
 RUN locale-gen "$LANG"
 
-RUN pip install zstandard
-
-
 # %include-run-task
 
 ENV SHELL=/bin/bash \