diff --git a/deploy/all.sh b/deploy/all.sh
index 96d9e30ca48e55a99931c493cdcb59d45e09b486..97f4db37d53f4a7fcca850c51a5bfe6cc7653cb4 100755
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -212,8 +212,8 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
 # Deploy QuestDB
 ./deploy/qdb.sh
 
-## Deploy Apache Kafka
-#./deploy/kafka.sh
+# Deploy Apache Kafka
+./deploy/kafka.sh
 
 # Expose Dashboard
 ./deploy/expose_dashboard.sh
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index 76e0a738322b2eb0354a1c489ac77a82da2ec1d9..a1429e443eaa70252ab2dd1f673ce46826b28744 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -112,16 +112,16 @@ export PROM_EXT_PORT_HTTP=${PROM_EXT_PORT_HTTP:-"9090"}
 export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
 
 
-## ----- Apache Kafka ------------------------------------------------------
-#
-## If not already set, set the namespace where Apache Kafka will be deployed.
-#export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}
-#
-## If not already set, set the port Apache Kafka server will be exposed to.
-#export KFK_SERVER_PORT=${KFK_SERVER_PORT:-"9092"}
-#
-## If not already set, if flag is YES, Apache Kafka will be redeployed and topic will be lost.
-#export KFK_REDEPLOY=${KFK_REDEPLOY:-""}
+# ----- Apache Kafka ------------------------------------------------------
+
+# If not already set, set the namespace where Apache Kafka will be deployed.
+export KFK_NAMESPACE=${KFK_NAMESPACE:-"kafka"}
+
+# If not already set, set the port Apache Kafka server will be exposed to.
+export KFK_SERVER_PORT=${KFK_SERVER_PORT:-"9092"}
+
+# If not already set, if flag is YES, Apache Kafka will be redeployed and topic will be lost.
+export KFK_REDEPLOY=${KFK_REDEPLOY:-""}
 
 ########################################################################################################################
 # Automated steps start here
@@ -153,12 +153,12 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type=
     --from-literal=CRDB_SSLMODE=require
 printf "\n"
 
-#echo ">>> Create Secret with Apache Kafka..."
-#KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')
-#kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
-#    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
-#    --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}
-#printf "\n"
+echo ">>> Create Secret with Apache Kafka..."
+KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')
+kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
+    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
+    --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}
+printf "\n"
 
 echo "Create secret with NATS data"
 NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service ${NATS_NAMESPACE} -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')
diff --git a/hackfest5/redeploy-tfs.sh b/hackfest5/redeploy-tfs.sh
index 688d8ef39cf97f327d450f5abd854aa0be533a6f..ff55bed3f55e355293e842b2f92c5547715cb247 100755
--- a/hackfest5/redeploy-tfs.sh
+++ b/hackfest5/redeploy-tfs.sh
@@ -22,7 +22,25 @@ kubectl delete namespace kafka --ignore-not-found
 printf "\n"
 
 echo "Deployting TeraFlowSDN..."
-./deploy/all.sh
+
+# Deploy CockroachDB
+./deploy/crdb.sh
+
+# Deploy NATS
+./deploy/nats.sh
+
+# Deploy QuestDB
+./deploy/qdb.sh
+
+# Expose Dashboard
+./deploy/expose_dashboard.sh
+
+# Deploy TeraFlowSDN
+./deploy/tfs.sh
+
+# Show deploy summary
+./deploy/show.sh
+
 printf "\n"
 
 echo "Waiting for Context to be subscribed to NATS..."