diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index cbf0099f9b9cd6..3dbd9ba34bda45 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -27,8 +27,8 @@ services:
   kafka-setup:
     image: linkedin/datahub-kafka-setup:debug
     build:
-      context: kafka-setup
-      dockerfile: Dockerfile
+      context: ../
+      dockerfile: ./docker/kafka-setup/Dockerfile
       args:
         APP_ENV: dev
     depends_on:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 691d221f626fa1..764ebf2e555dda 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -31,7 +31,8 @@ services:
   # This "container" is a workaround to pre-create topics
   kafka-setup:
     build:
-      context: kafka-setup
+      dockerfile: ./docker/kafka-setup/Dockerfile
+      context: ../
     image: ${DATAHUB_KAFKA_SETUP_IMAGE:-linkedin/datahub-kafka-setup}:${DATAHUB_VERSION:-head}
     env_file: kafka-setup/env/docker.env
     hostname: kafka-setup