diff --git a/02_pinot-kafka/Makefile b/02_pinot-kafka/Makefile
index 603c944..44e0d8d 100644
--- a/02_pinot-kafka/Makefile
+++ b/02_pinot-kafka/Makefile
@@ -61,7 +61,7 @@ create:
 	@printf "$(GREEN)✔$(NC) 🪲 Kafka is ready!\n"
 
 topic:
-	docker exec kafka kafka-topics.sh \
+	docker exec uncorking-pinot-kafka kafka-topics.sh \
 		--bootstrap-server localhost:9092 \
 		--create \
 		--topic movie_ratings
diff --git a/02_pinot-kafka/docker-compose.yml b/02_pinot-kafka/docker-compose.yml
index e7213aa..8c6d4c5 100644
--- a/02_pinot-kafka/docker-compose.yml
+++ b/02_pinot-kafka/docker-compose.yml
@@ -96,6 +96,7 @@ services:
       timeout: 10s
       retries: 10
     environment:
+      - PATH=/opt/kafka/bin:$PATH
       # KRaft settings
       - KAFKA_NODE_ID=0
       - KAFKA_PROCESS_ROLES=controller,broker
diff --git a/03_pinot-kafka-flink/Makefile b/03_pinot-kafka-flink/Makefile
index d9db547..7487504 100644
--- a/03_pinot-kafka-flink/Makefile
+++ b/03_pinot-kafka-flink/Makefile
@@ -1,7 +1,7 @@
 GREEN=\033[0;32m
 NC=\033[0m # No Color
 
-base: create topic tables validate info
+base: create topic tables validate superset-setup info
 
 create:
 	docker compose build --no-cache
@@ -51,7 +51,7 @@ create:
 	@printf "$(GREEN)✔$(NC) 🪲 Kafka is ready!\n"
 
 topic:
-	docker exec kafka kafka-topics.sh \
+	docker exec uncorking-pinot-kafka kafka-topics.sh \
 		--bootstrap-server localhost:9092 \
 		--create \
 		--topic rated_movies
@@ -79,11 +79,17 @@ validate:
 		exit 1; \
 	fi; \
 
+superset-setup:
+	docker exec superset-pinot superset fab create-admin --username admin --firstname Superset --lastname Admin --email admin@superset.com --password admin
+	docker exec superset-pinot superset db upgrade  
+	docker exec superset-pinot superset init
+
 info:     	
 	@printf "\n==========================================================\n"
 	@printf "🍷 Pinot Query UI:		\033[4mhttp://localhost:9000\033[0m\n"
 	@printf "🦊 Redpanda Console:		\033[4mhttp://localhost:9080\033[0m\n"
 	@printf "🐿️ Flink Console:		\033[4mhttp://localhost:8081\033[0m\n"
+	@printf "📊 Superset Dashboard		\033[4mhttp://localhost:8088\033[0m\n"
 	@printf "==========================================================\n"
 
 destroy:
diff --git a/03_pinot-kafka-flink/docker-compose.yml b/03_pinot-kafka-flink/docker-compose.yml
index f56b91e..d2ff962 100644
--- a/03_pinot-kafka-flink/docker-compose.yml
+++ b/03_pinot-kafka-flink/docker-compose.yml
@@ -96,6 +96,7 @@ services:
       timeout: 10s
       retries: 10
     environment:
+      - PATH=/opt/kafka/bin:$PATH
       # KRaft settings
       - KAFKA_NODE_ID=0
       - KAFKA_PROCESS_ROLES=controller,broker