diff --git a/shotover-proxy/benches/windsock/kafka/bench.rs b/shotover-proxy/benches/windsock/kafka/bench.rs
index 0e5278879..e426cc5b1 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.8.1-debian-12-r1",
+                    "bitnami/kafka:3.9.0-debian-12-r6",
                     &[
                         ("ALLOW_PLAINTEXT_LISTENER".to_owned(), "yes".to_owned()),
                         (
diff --git a/shotover-proxy/tests/kafka_int_tests/mod.rs b/shotover-proxy/tests/kafka_int_tests/mod.rs
index 6ec23af48..d7e2d33e1 100644
--- a/shotover-proxy/tests/kafka_int_tests/mod.rs
+++ b/shotover-proxy/tests/kafka_int_tests/mod.rs
@@ -606,9 +606,10 @@ async fn cluster_2_racks_multi_shotover(#[case] driver: KafkaDriver) {
 #[cfg_attr(feature = "kafka-cpp-driver-tests", case::cpp(KafkaDriver::Cpp))]
 #[case::java(KafkaDriver::Java)]
 #[tokio::test(flavor = "multi_thread")] // multi_thread is needed since java driver will block when consuming, causing shotover logs to not appear
-async fn cluster_2_racks_multi_shotover_kafka_3_9(#[case] driver: KafkaDriver) {
-    let _docker_compose =
-        docker_compose("tests/test-configs/kafka/cluster-2-racks/docker-compose-kafka-3.9.yaml");
+async fn cluster_2_racks_multi_shotover_rebalance_protocol(#[case] driver: KafkaDriver) {
+    let _docker_compose = docker_compose(
+        "tests/test-configs/kafka/cluster-2-racks/docker-compose-rebalance-protocol.yaml",
+    );
 
     // One shotover instance per rack
     let mut shotovers = vec![];
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 8a1722dc5..1cbde0d3e 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.8.1-debian-12-r1'
+    image: 'bitnami/kafka:3.9.0-debian-12-r6'
     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 8b74d8e2b..ae5e58872 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 daa4f28ef..7fedcad38 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
diff --git a/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose-kafka-3.9.yaml b/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose-rebalance-protocol.yaml
similarity index 97%
rename from shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose-kafka-3.9.yaml
rename to shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose-rebalance-protocol.yaml
index 317e247bd..1caa060dd 100644
--- a/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose-kafka-3.9.yaml
+++ b/shotover-proxy/tests/test-configs/kafka/cluster-2-racks/docker-compose-rebalance-protocol.yaml
@@ -9,7 +9,7 @@ networks:
           gateway: 172.16.1.1
 services:
   kafka0:
-    image: &image 'bitnami/kafka:3.9.0-debian-12-r3'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     networks:
       cluster_subnet:
         ipv4_address: 172.16.1.2
@@ -95,4 +95,4 @@ services:
       KAFKA_CFG_ADVERTISED_LISTENERS: "BROKER://172.16.1.7:9092"
       KAFKA_CFG_NODE_ID: 5
       KAFKA_CFG_BROKER_RACK: "rack2"
-    volumes: *volumes
+    volumes: *volumes
\ No newline at end of file
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 0d7b75424..0d4b6897d 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 866ef0b90..53e89de79 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 d4764a7b9..54c2e6205 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 dd0ea9fe1..db315142b 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 21b44eb35..f0eefb1fd 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 33126645b..3f18295df 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 eeba808ad..1a27eebf0 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.8.1-debian-12-r1'
+    image: &image 'bitnami/kafka:3.9.0-debian-12-r6'
     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 e5bfaa0f9..5298f0269 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.8.1-debian-12-r1'
+    image: 'bitnami/kafka:3.9.0-debian-12-r6'
     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 e257191fb..e0f064ce2 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.8.1-debian-12-r1'
+    image: 'bitnami/kafka:3.9.0-debian-12-r6'
     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 907e5965e..b1bc7d441 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.8.1-debian-12-r1'
+    image: 'bitnami/kafka:3.9.0-debian-12-r6'
     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 93e2b3d40..828ec643d 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.8.1-debian-12-r1'
+    image: 'bitnami/kafka:3.9.0-debian-12-r6'
     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 f311b4050..c4260e331 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.8.1-debian-12-r1'
+    image: 'bitnami/kafka:3.9.0-debian-12-r6'
     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 d08cde6bb..f137b8df5 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.8.1-debian-12-r1'
+    image: 'bitnami/kafka:3.9.0-debian-12-r6'
     ports:
       - '9092:9092'
     environment:
diff --git a/test-helpers/src/docker_compose.rs b/test-helpers/src/docker_compose.rs
index 6efa4afc2..1b43da34f 100644
--- a/test-helpers/src/docker_compose.rs
+++ b/test-helpers/src/docker_compose.rs
@@ -15,7 +15,7 @@ pub fn new_moto() -> DockerCompose {
     docker_compose("tests/transforms/docker-compose-moto.yaml")
 }
 
-pub static IMAGE_WAITERS: [Image; 11] = [
+pub static IMAGE_WAITERS: [Image; 10] = [
     Image {
         name: "motoserver/moto",
         log_regex_to_wait_for: r"Press CTRL\+C to quit",
@@ -59,12 +59,7 @@ pub static IMAGE_WAITERS: [Image; 11] = [
         timeout: Duration::from_secs(120),
     },
     Image {
-        name: "bitnami/kafka:3.8.1-debian-12-r1",
-        log_regex_to_wait_for: r"Kafka Server started",
-        timeout: Duration::from_secs(120),
-    },
-    Image {
-        name: "bitnami/kafka:3.9.0-debian-12-r3",
+        name: "bitnami/kafka:3.9.0-debian-12-r6",
         log_regex_to_wait_for: r"Kafka Server started",
         timeout: Duration::from_secs(120),
     },