diff --git a/.github/workflows/haskell.yaml b/.github/workflows/haskell.yaml
index cde4e1d086..98f1707d9e 100644
--- a/.github/workflows/haskell.yaml
+++ b/.github/workflows/haskell.yaml
@@ -14,7 +14,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/haskell/Dockerfile b/haskell/Dockerfile
index aa63d5e939..af406a52cd 100644
--- a/haskell/Dockerfile
+++ b/haskell/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-slim
+FROM debian:bookworm-slim
 
 RUN \
   apt-get update && \
diff --git a/python/Dockerfile.benchmark b/python/Dockerfile.benchmark
index dcd3d8dd68..ced23a8b8d 100644
--- a/python/Dockerfile.benchmark
+++ b/python/Dockerfile.benchmark
@@ -1,8 +1,8 @@
-FROM python:3.7-slim-buster
+FROM python:3.7-slim-bookworm
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN    apt-get update \
-    && apt-get install -y git llvm-7-dev build-essential unzip curl libjson-perl libdigest-crc-perl
+    && apt-get install -y git build-essential unzip curl libjson-perl libdigest-crc-perl
 
 # install perl runtime for kaitai struct
 RUN \
diff --git a/rust/Dockerfile b/rust/Dockerfile
index eaa556d0c0..d7dc4856f0 100644
--- a/rust/Dockerfile
+++ b/rust/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.67.1-slim-buster
+FROM rust:1.88.0-slim
 
 ARG DEBIAN_FRONTEND=noninterative
 
diff --git a/test_data/benchmark_main.py b/test_data/benchmark_main.py
index 507fc25120..ad95558b10 100755
--- a/test_data/benchmark_main.py
+++ b/test_data/benchmark_main.py
@@ -11,10 +11,10 @@
 
 # How much faster Rust should be than other implementations
 RATIOS_SBP2JSON = {
-    "haskell"       : 3.01,
+    "haskell"       : 3.2,
     "python"        : 23.38,
     "kaitai_python" : 5.00,
-    "kaitai_perl"   : 18,
+    "kaitai_perl"   : 20,
 }
 
 RATIOS_JSON2SBP = {