diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index 2b3a4d4da9dfc7..b8b4dbee88037f 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -426,7 +426,7 @@ jobs:
         setup,
         gms_build,
         frontend_build,
-#        kafka_setup_build,
+        kafka_setup_build,
         mysql_setup_build,
         elasticsearch_setup_build,
 #        mae_consumer_build,
@@ -460,11 +460,11 @@ jobs:
         if: ${{ needs.setup.outputs.publish != 'true' }}
         with:
           image: ${{ env.DATAHUB_FRONTEND_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
-#      - name: Download Kafka Setup image
-#        uses: ishworkh/docker-image-artifact-download@v1
-#        if: ${{ needs.setup.outputs.publish != 'true' }}
-#        with:
-#          image: ${{ env.DATAHUB_KAFKA_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
+      - name: Download Kafka Setup image
+        uses: ishworkh/docker-image-artifact-download@v1
+        if: ${{ needs.setup.outputs.publish != 'true' }}
+        with:
+          image: ${{ env.DATAHUB_KAFKA_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
       - name: Download Mysql Setup image
         uses: ishworkh/docker-image-artifact-download@v1
         if: ${{ needs.setup.outputs.publish != 'true' }}
diff --git a/smoke-test/run-quickstart.sh b/smoke-test/run-quickstart.sh
index 6998267981b3c9..74ba6c9d24cc9f 100755
--- a/smoke-test/run-quickstart.sh
+++ b/smoke-test/run-quickstart.sh
@@ -15,7 +15,6 @@ echo "test_user:test_pass" >> ~/.datahub/plugins/frontend/auth/user.props
 echo "DATAHUB_VERSION = $DATAHUB_VERSION"
 DATAHUB_TELEMETRY_ENABLED=false  \
 DOCKER_COMPOSE_BASE="file://$( dirname "$DIR" )" \
-datahub docker quickstart --version ${DATAHUB_VERSION} --dump-logs-on-failure
+datahub docker quickstart --version ${DATAHUB_VERSION} --kafka-setup --dump-logs-on-failure
 
 # --standalone_consumers
-# --kafka-setup