diff --git a/deploy/kafka.sh b/deploy/kafka.sh
index b2f2f1f9e1a9e3040b1b9b8442ca25fa3ff2e2df..21ba89408e6bdadd92a2a96c59d6d24cd580952e 100755
--- a/deploy/kafka.sh
+++ b/deploy/kafka.sh
@@ -81,7 +81,7 @@ echo ">>> Checking if Apache Kafka is deployed ... "
 if [ "$KFK_REDEPLOY" == "YES" ]; then
     kafka_deploy
 elif kubectl get --namespace ${KFK_NAMESPACE} deployments.apps &> /dev/null; then
-    echo ">>> Apache Kafka already present; skipping step..."
+    echo ">>> Apache Kafka already present; skipping step."
 else
     kafka_deploy
 fi
diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index d92d789e3b9cc5bb02a3d3dd970f0c997fd48e4e..4ecfaae9972ec136b2b7e74c6071392ba288f0d3 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -172,9 +172,9 @@ printf "\n"
 
 echo "Create secret with Apache Kafka kfk-kpi-data for KPI and Telemetry microservices"
 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 ${KFK_NAMESPACE} --type='Opaque' \
+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_NAMESPACE}
+    --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}
 printf "\n"
 
 echo "Create secret with NATS data"
diff --git a/manifests/kpi_value_apiservice.yaml b/manifests/kpi_value_apiservice.yaml
index 74eb90f675794f1b451b04af55e191edff58fae5..e4dcb00545ffaa33de39fd29c029780b777ea91f 100644
--- a/manifests/kpi_value_apiservice.yaml
+++ b/manifests/kpi_value_apiservice.yaml
@@ -39,6 +39,9 @@ spec:
           env:
             - name: LOG_LEVEL
               value: "INFO"
+          envFrom:
+            - secretRef:
+                name: kfk-kpi-data
           readinessProbe:
             exec:
               command: ["/bin/grpc_health_probe", "-addr=:30020"]
diff --git a/manifests/kpi_value_writerservice.yaml b/manifests/kpi_value_writerservice.yaml
index 8a8e44ec2a571f1290e30a08d1c896a6339cbe46..e21e36f48ba08999f142e8548fed61cd2dfef0cc 100644
--- a/manifests/kpi_value_writerservice.yaml
+++ b/manifests/kpi_value_writerservice.yaml
@@ -39,6 +39,9 @@ spec:
           env:
             - name: LOG_LEVEL
               value: "INFO"
+          envFrom:
+            - secretRef:
+                name: kfk-kpi-data
           readinessProbe:
             exec:
               command: ["/bin/grpc_health_probe", "-addr=:30030"]