diff --git a/docker-compose.yml b/docker-compose.yml
index 91b9ef2b05..623977e8f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,6 @@ services:
   nakadi:
     build:
       context: .
-      args:
-        BASE_IMAGE: "registry.opensource.zalan.do/library/openjdk-11-jre-slim:latest"
     ports:
     - "8080:8080"
     depends_on:
@@ -43,7 +41,7 @@ services:
     - "2181:2181"
 
   kafka:
-    image: bitnami/kafka:3.1.1
+    image: ubuntu/kafka:3.1-22.04_edge
     ports:
     - "29092:29092"
     - "9092:9092"