diff --git a/deploy/tfs.sh b/deploy/tfs.sh
index 4268d50b2504cc4a8767d3bb9ff4c8fcdae7d1af..65c1e8de28f2045b2ac78938b84d3c33e282025e 100755
--- a/deploy/tfs.sh
+++ b/deploy/tfs.sh
@@ -147,56 +147,16 @@ sleep 2
 printf "\n"
 
 echo ">>> Create Secret with CockroachDB data..."
-echo "For Context"
 CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
-# CRDB_DATABASE_CONTEXT="${CRDB_DATABASE}_context"  # TODO: change by specific configurable environment variable
 kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
     --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
     --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
     --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
     --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \
     --from-literal=CRDB_SSLMODE=require
-# printf "\n"
-    # --from-literal=CRDB_DATABASE=${CRDB_DATABASE_CONTEXT} \
-
-echo "For KPI Management"
-CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
-# CRDB_DATABASE_KPI_MGMT="${CRDB_DATABASE}_kpi"
-kubectl create secret generic crdb-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
-    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
-    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
-    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
-    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \
-    --from-literal=CRDB_SSLMODE=require
-# printf "\n"
-    # --from-literal=CRDB_DATABASE=${CRDB_DATABASE_KPI_MGMT} \
-
-echo "For Telemetry"
-CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
-# CRDB_DATABASE_TELEMETRY="${CRDB_DATABASE}_telemetry"
-kubectl create secret generic crdb-telemetry --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
-    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
-    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
-    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
-    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \
-    --from-literal=CRDB_SSLMODE=require
-# printf "\n"
-    # --from-literal=CRDB_DATABASE=${CRDB_DATABASE_TELEMETRY} \
-
-echo "For Analytics"
-CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
-# CRDB_DATABASE_ANALYTICS="${CRDB_DATABASE}_analytics"
-kubectl create secret generic crdb-analytics --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
-    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \
-    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \
-    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \
-    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \
-    --from-literal=CRDB_SSLMODE=require
-# printf "\n"
-    # --from-literal=CRDB_DATABASE=${CRDB_DATABASE_ANALYTICS} \
+printf "\n"
 
-echo ">>> Create Secret with Apache Kakfa"
-echo "For KPI, Telemetry and Analytics"
+echo ">>> Create Secret with Apache Kakfa..."
 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} \
diff --git a/manifests/analyticsservice.yaml b/manifests/analyticsservice.yaml
index e15214dbde6bb4356faa5aee9744f03845780c30..61666ead951c73e4034110b00a51743d33bd4ce2 100644
--- a/manifests/analyticsservice.yaml
+++ b/manifests/analyticsservice.yaml
@@ -43,7 +43,7 @@ spec:
               value: "9192"
           envFrom:
             - secretRef:
-                name: crdb-analytics
+                name: crdb-data
             - secretRef:
                 name: kfk-kpi-data
           readinessProbe:
diff --git a/manifests/kpi_managerservice.yaml b/manifests/kpi_managerservice.yaml
index efc3a720d5bd3f8f561f03fb679c2461dd0858e5..31eaf1284a08961adc6fe97d5e54eeaa7a98edae 100644
--- a/manifests/kpi_managerservice.yaml
+++ b/manifests/kpi_managerservice.yaml
@@ -43,7 +43,7 @@ spec:
               value: "tfs_kpi"
           envFrom:
             - secretRef:
-                name: crdb-kpi-data
+                name: crdb-data
           readinessProbe:
             exec:
               command: ["/bin/grpc_health_probe", "-addr=:30010"]
diff --git a/manifests/telemetryservice.yaml b/manifests/telemetryservice.yaml
index 9c979713d787c8e7f01e8b52f91c146017635e6d..c3763d6a91756c2592ec819d60bc649584ef3ca9 100644
--- a/manifests/telemetryservice.yaml
+++ b/manifests/telemetryservice.yaml
@@ -43,7 +43,7 @@ spec:
               value: "9192"
           envFrom:
             - secretRef:
-                name: crdb-telemetry
+                name: crdb-data
             - secretRef:
                 name: kfk-kpi-data
           readinessProbe: