diff --git a/shotover-proxy/benches/windsock/kafka/bench.rs b/shotover-proxy/benches/windsock/kafka/bench.rs
index 0c64814c2..0e5278879 100644
--- a/shotover-proxy/benches/windsock/kafka/bench.rs
+++ b/shotover-proxy/benches/windsock/kafka/bench.rs
@@ -144,7 +144,7 @@ impl KafkaBench {
 
             tasks.push(tokio::spawn(async move {
                 node.run_container(
-                    "bitnami/kafka:3.6.1-debian-11-r24",
+                    "bitnami/kafka:3.8.1-debian-12-r1",
                     &[
                         ("ALLOW_PLAINTEXT_LISTENER".to_owned(), "yes".to_owned()),
                         (
diff --git a/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml
index 578047056..8a1722dc5 100644
--- a/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/bench/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   kafka0:
-    image: 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: 'bitnami/kafka:3.8.1-debian-12-r1'
     ports:
       - '9192:9192'
     environment:
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose-short-idle-timeout.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose-short-idle-timeout.yaml
index dd37eaeb9..8b74d8e2b 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose-short-idle-timeout.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose-short-idle-timeout.yaml
@@ -9,7 +9,7 @@ networks:
           gateway: 172.16.1.1
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml
index 7c9bd5940..daa4f28ef 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-1-rack/docker-compose.yaml
@@ -9,7 +9,7 @@ networks:
           gateway: 172.16.1.1
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml
index 91eec63b2..0d7b75424 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose.yaml
@@ -9,7 +9,7 @@ networks:
           gateway: 172.16.1.1
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-3-racks/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-3-racks/docker-compose.yaml
index e19e9ee7a..866ef0b90 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-3-racks/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-3-racks/docker-compose.yaml
@@ -9,7 +9,7 @@ networks:
           gateway: 172.16.1.1
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-mtls/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-mtls/docker-compose.yaml
index 0a92c0d46..d4764a7b9 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-mtls/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-mtls/docker-compose.yaml
@@ -9,7 +9,7 @@ networks:
           gateway: 172.16.1.1
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-sasl-plain/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-sasl-plain/docker-compose.yaml
index 24fce30c1..dd0ea9fe1 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-sasl-plain/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-sasl-plain/docker-compose.yaml
@@ -10,7 +10,7 @@ networks:
 
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram-over-mtls/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram-over-mtls/docker-compose.yaml
index 3224801de..21b44eb35 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram-over-mtls/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram-over-mtls/docker-compose.yaml
@@ -10,7 +10,7 @@ networks:
 
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram/docker-compose.yaml
index b2ffe5fb3..33126645b 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-sasl-scram/docker-compose.yaml
@@ -10,7 +10,7 @@ networks:
 
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml
index fc283add6..eeba808ad 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-tls/docker-compose.yaml
@@ -9,7 +9,7 @@ networks:
           gateway: 172.16.1.1
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: &image 'bitnami/kafka:3.8.1-debian-12-r1'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-mtls/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough-mtls/docker-compose.yaml
index cb1660d4f..e5bfaa0f9 100644
--- a/shotover-proxy/tests/test-configs/kafka/passthrough-mtls/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/passthrough-mtls/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   kafka0:
-    image: 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: 'bitnami/kafka:3.8.1-debian-12-r1'
     ports:
       - '9092:9092'
     environment:
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-plain/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-plain/docker-compose.yaml
index 2c7141edf..e257191fb 100644
--- a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-plain/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-plain/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   kafka:
-    image: 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: 'bitnami/kafka:3.8.1-debian-12-r1'
     ports:
       - '9092:9092'
       - '9093:9093'
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-scram/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-scram/docker-compose.yaml
index a64de2303..907e5965e 100644
--- a/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-scram/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/passthrough-sasl-scram/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   kafka:
-    image: 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: 'bitnami/kafka:3.8.1-debian-12-r1'
     ports:
       - '9092:9092'
     environment:
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml
index 65bdf9654..93e2b3d40 100644
--- a/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/passthrough-tls/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   kafka0:
-    image: 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: 'bitnami/kafka:3.8.1-debian-12-r1'
     ports:
       - '9092:9092'
     environment:
diff --git a/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml
index 6a3b3ee23..f311b4050 100644
--- a/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/passthrough/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   kafka0:
-    image: 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: 'bitnami/kafka:3.8.1-debian-12-r1'
     ports:
       - '9092:9092'
     environment:
diff --git a/shotover-proxy/tests/test-configs/kafka/single-sasl-scram-plaintext-source-tls-sink/docker-compose.yaml b/shotover-proxy/tests/test-configs/kafka/single-sasl-scram-plaintext-source-tls-sink/docker-compose.yaml
index 5e8e2ff58..d08cde6bb 100644
--- a/shotover-proxy/tests/test-configs/kafka/single-sasl-scram-plaintext-source-tls-sink/docker-compose.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/single-sasl-scram-plaintext-source-tls-sink/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   kafka:
-    image: 'bitnami/kafka:3.6.1-debian-11-r24'
+    image: 'bitnami/kafka:3.8.1-debian-12-r1'
     ports:
       - '9092:9092'
     environment:
diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs
index 858127b77..54d9af136 100644
--- a/test-helpers/src/docker_compose.rs
+++ b/test-helpers/src/docker_compose.rs
@@ -64,7 +64,7 @@ pub static IMAGE_WAITERS: [Image; 11] = [
         timeout: Duration::from_secs(120),
     },
     Image {
-        name: "bitnami/kafka:3.6.1-debian-11-r24",
+        name: "bitnami/kafka:3.8.1-debian-12-r1",
         log_regex_to_wait_for: r"Kafka Server started",
         timeout: Duration::from_secs(120),
     },