diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 32988bd89..1bd47b310 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -121,13 +121,13 @@ blocks:
       jobs:
         - name: 'Build and test with "classic" protocol'
           commands:
-            - cd test/docker && docker-compose up -d kafka && sleep 30 && cd ../..
+            - cd test/docker && docker-compose up -d && sleep 30 && cd ../..
             - export SEMAPHORE_SKIP_FLAKY_TESTS='true'
             - dotnet restore
             - cd test/Confluent.Kafka.IntegrationTests && dotnet test -l "console;verbosity=normal" && cd ../..
         - name: 'Build and test with "consumer" protocol'
           commands:
-            - cd test/docker && docker-compose up -d kafka_4 && sleep 30 && cd ../..
+            - cd test/docker && docker-compose -f docker-compose-kraft.yaml up -d && sleep 30 && cd ../..
             - export SEMAPHORE_SKIP_FLAKY_TESTS='true'
             - export TEST_CONSUMER_GROUP_PROTOCOL=consumer
             - dotnet restore
@@ -145,7 +145,7 @@ blocks:
       jobs:
         - name: 'Build and test'
           commands:
-            - cd test/docker && docker-compose up -d kafka schema-registry_2 && cd ../..
+            - cd test/docker && docker-compose up -d && cd ../..
             - export SEMAPHORE_SKIP_FLAKY_TESTS='true'
             - dotnet restore
             - cd test/Confluent.SchemaRegistry.Serdes.IntegrationTests && dotnet test -l "console;verbosity=normal" && cd ../..
diff --git a/test/docker/docker-compose-kraft.yaml b/test/docker/docker-compose-kraft.yaml
new file mode 100644
index 000000000..99be17a29
--- /dev/null
+++ b/test/docker/docker-compose-kraft.yaml
@@ -0,0 +1,13 @@
+version: '3'
+services:
+  kafka:
+    build: ./kraft
+    restart: always
+    ports:
+      - 9092:29092
+      - 9093:29093
+    volumes:
+      - ./kraft/server.properties:/etc/kafka/server.properties
+      - ./kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
+    environment:
+      KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf"
\ No newline at end of file
diff --git a/test/docker/docker-compose.yaml b/test/docker/docker-compose.yaml
index d9113fcd3..cafe09ec5 100644
--- a/test/docker/docker-compose.yaml
+++ b/test/docker/docker-compose.yaml
@@ -76,17 +76,6 @@ services:
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_AUTHORIZER_CLASS_NAME: kafka.security.authorizer.AclAuthorizer
       KAFKA_SUPER_USERS: "User:ANONYMOUS"
-  kafka_4:
-    build: ./kraft
-    restart: always
-    ports:
-      - 9092:29092
-      - 9093:29093
-    volumes:
-      - ./kraft/server.properties:/etc/kafka/server.properties
-      - ./kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
-    environment:
-      KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf"
   schema-registry:
     image: confluentinc/cp-schema-registry
     restart: always
diff --git a/test/docker/kraft/server.properties b/test/docker/kraft/server.properties
index 77861bdd0..a19927043 100644
--- a/test/docker/kraft/server.properties
+++ b/test/docker/kraft/server.properties
@@ -2,7 +2,7 @@ broker.id=0
 port=9092
 reserved.broker.max.id=65536
 listeners=PLAINTEXT://0.0.0.0:9092,CONTROLLER://0.0.0.0:38705,SASL_PLAINTEXT://0.0.0.0:9093,DOCKER://0.0.0.0:29092,DOCKER_SASL_PLAINTEXT://0.0.0.0:29093
-advertised.listeners=PLAINTEXT://kafka_4:9092,SASL_PLAINTEXT://kafka_4:9093,DOCKER://localhost:9092,DOCKER_SASL_PLAINTEXT://localhost:9093
+advertised.listeners=PLAINTEXT://kafka:9092,SASL_PLAINTEXT://kafka:9093,DOCKER://localhost:9092,DOCKER_SASL_PLAINTEXT://localhost:9093
 log.dir=/logs
 log.dirs=/logs
 num.partitions=4