diff --git a/addons/apecloud-mysql/scripts-ut-spec/etcd_clean_spec.sh b/addons/apecloud-mysql/scripts-ut-spec/etcd_clean_spec.sh
index b06071946..ff900e08d 100644
--- a/addons/apecloud-mysql/scripts-ut-spec/etcd_clean_spec.sh
+++ b/addons/apecloud-mysql/scripts-ut-spec/etcd_clean_spec.sh
@@ -14,8 +14,8 @@ Describe "Etcd Clean Script Tests"
   Describe "when SERVICE_ETCD_ENDPOINT is set,"
     setup() {
       SERVICE_ETCD_ENDPOINT="http://localhost:2379"
-      KB_NAMESPACE="test-namespace"
-      KB_CLUSTER_NAME="test-cluster"
+      CLUSTER_NAMESPACE="test-namespace"
+      CLUSTER_NAME="test-cluster"
       ETCDCTL_API="3"
     }
     Before "setup"
@@ -67,8 +67,8 @@ Describe "Etcd Clean Script Tests"
   Describe "when ETCDCTL_API is set to 2"
     setup() {
       SERVICE_ETCD_ENDPOINT="http://localhost:2379"
-      KB_NAMESPACE="test-namespace"
-      KB_CLUSTER_NAME="test-cluster"
+      CLUSTER_NAMESPACE="test-namespace"
+      CLUSTER_NAME="test-cluster"
       ETCDCTL_API="2"
     }
     Before "setup"
diff --git a/addons/apecloud-mysql/scripts-ut-spec/etcd_post_start_spec.sh b/addons/apecloud-mysql/scripts-ut-spec/etcd_post_start_spec.sh
index 64f91a9c4..76da84cbe 100644
--- a/addons/apecloud-mysql/scripts-ut-spec/etcd_post_start_spec.sh
+++ b/addons/apecloud-mysql/scripts-ut-spec/etcd_post_start_spec.sh
@@ -7,8 +7,8 @@ Describe "etcd-post-start.sh script tests"
       LOCAL_ETCD_POD_FQDN="etcd1,etcd2"
       LOCAL_ETCD_PORT="2379"
       CELL="zone1"
-      KB_NAMESPACE="test-namespace"
-      KB_CLUSTER_NAME="test-cluster"
+      CLUSTER_NAMESPACE="test-namespace"
+      CLUSTER_NAME="test-cluster"
       ETCDCTL_API="3"
     }
     Before "setup"
@@ -27,8 +27,8 @@ Describe "etcd-post-start.sh script tests"
     setup() {
       SERVICE_ETCD_ENDPOINT="http://etcd1:2379,http://etcd2:2379"
       CELL="zone1"
-      KB_NAMESPACE="test-namespace"
-      KB_CLUSTER_NAME="test-cluster"
+      CLUSTER_NAMESPACE="test-namespace"
+      CLUSTER_NAME="test-cluster"
       ETCDCTL_API="3"
     }
     Before "setup"
@@ -46,8 +46,8 @@ Describe "etcd-post-start.sh script tests"
   Describe "when both LOCAL_ETCD_POD_FQDN and SERVICE_ETCD_ENDPOINT are empty"
     setup() {
       CELL="zone1"
-      KB_NAMESPACE="test-namespace"
-      KB_CLUSTER_NAME="test-cluster"
+      CLUSTER_NAMESPACE="test-namespace"
+      CLUSTER_NAME="test-cluster"
       ETCDCTL_API="3"
     }
     Before "setup"
@@ -64,8 +64,8 @@ Describe "etcd-post-start.sh script tests"
       LOCAL_ETCD_POD_FQDN="etcd1,etcd2"
       LOCAL_ETCD_PORT="2379"
       CELL="zone1"
-      KB_NAMESPACE="test-namespace"
-      KB_CLUSTER_NAME="test-cluster"
+      CLUSTER_NAMESPACE="test-namespace"
+      CLUSTER_NAME="test-cluster"
       ETCDCTL_API="2"
     }
     Before "setup"
@@ -95,8 +95,8 @@ Describe "etcd-post-start.sh script tests"
       LOCAL_ETCD_POD_FQDN="etcd1,etcd2"
       LOCAL_ETCD_PORT="2379"
       CELL="zone1"
-      KB_NAMESPACE="test-namespace"
-      KB_CLUSTER_NAME="test-cluster"
+      CLUSTER_NAMESPACE="test-namespace"
+      CLUSTER_NAME="test-cluster"
       ETCDCTL_API="3"
     }
     Before "setup"
diff --git a/addons/apecloud-mysql/scripts-ut-spec/setup_spec.sh b/addons/apecloud-mysql/scripts-ut-spec/setup_spec.sh
index 83310729e..13b476175 100644
--- a/addons/apecloud-mysql/scripts-ut-spec/setup_spec.sh
+++ b/addons/apecloud-mysql/scripts-ut-spec/setup_spec.sh
@@ -17,8 +17,8 @@ Describe "ApeCloud MySQL Startup Script Tests"
     MY_POD_LIST=wesql1-mysql-0,wesql1-mysql-1,wesql1-mysql-2
     MY_COMP_REPLICAS=3
     MY_COMP_NAME=mysql
-    MY_CLUSTER_NAME=wesql1
-    MY_CLUSTER_UID=c3636ff1-bb54-47a4-ac4e-111ba9b41295
+    CLUSTER_NAME=wesql1
+    CLUSTER_UID=c3636ff1-bb54-47a4-ac4e-111ba9b41295
     KB_SERVICE_CHARACTER_TYPE=wesql
     KB_MYSQL_VOLUME_DIR=.
   }
@@ -90,7 +90,7 @@ Describe "get_service_name function"
   Include ../scripts/setup.sh
   setup() {
     MY_COMP_NAME=mysql
-    MY_CLUSTER_NAME=wesql1
+    CLUSTER_NAME=wesql1
   }
   Before "setup"
   It "returns the correct service name"
@@ -104,7 +104,7 @@ Describe "get_cluster_members function"
   setup() {
     MY_POD_LIST="pod1,pod2,pod3"
     MY_COMP_NAME=mysql
-    MY_CLUSTER_NAME=wesql1
+    CLUSTER_NAME=wesql1
     MYSQL_CONSENSUS_PORT=13306
   }
   Before "setup"
@@ -132,9 +132,9 @@ Describe "generate_cluster_info function"
     MY_POD_NAME="pod1"
     MY_POD_LIST="pod1,pod2,pod3"
     MY_COMP_NAME=mysql
-    MY_CLUSTER_NAME=wesql1
+    CLUSTER_NAME=wesql1
     MY_COMP_REPLICAS=3
-    MY_CLUSTER_UID="test-uid"
+    CLUSTER_UID="test-uid"
   }
   Before "setup"
   It "sets the correct environment variables"
diff --git a/addons/apecloud-mysql/scripts-ut-spec/vtctld_spec.sh b/addons/apecloud-mysql/scripts-ut-spec/vtctld_spec.sh
index 8ca2bec4c..0fced012d 100644
--- a/addons/apecloud-mysql/scripts-ut-spec/vtctld_spec.sh
+++ b/addons/apecloud-mysql/scripts-ut-spec/vtctld_spec.sh
@@ -9,8 +9,8 @@ Describe "vtctld.sh script tests"
     export CELL="zone1"
     export VTCTLD_GRPC_PORT="15999"
     export VTCTLD_WEB_PORT="15000"
-    export KB_NAMESPACE="namespace"
-    export KB_CLUSTER_NAME="cluster"
+    export CLUSTER_NAMESPACE="namespace"
+    export CLUSTER_NAME="cluster"
     export VTDATAROOT="/var/lib/vitess"
   }
   Before "setup"
@@ -22,8 +22,8 @@ Describe "vtctld.sh script tests"
     unset CELL
     unset VTCTLD_GRPC_PORT
     unset VTCTLD_WEB_PORT
-    unset KB_NAMESPACE
-    unset KB_CLUSTER_NAME
+    unset CLUSTER_NAMESPACE
+    unset CLUSTER_NAME
     unset VTDATAROOT
   }
   After "cleanup"
diff --git a/addons/apecloud-mysql/scripts/etcd-clean.sh b/addons/apecloud-mysql/scripts/etcd-clean.sh
index 51322fce3..33f21c605 100644
--- a/addons/apecloud-mysql/scripts/etcd-clean.sh
+++ b/addons/apecloud-mysql/scripts/etcd-clean.sh
@@ -22,17 +22,17 @@ servers=${servers:1}
 
 echo $servers
 
-echo "Deleting all keys with prefix /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME} from Etcd server at ${endpoints}..."
+echo "Deleting all keys with prefix /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME} from Etcd server at ${endpoints}..."
 
 # Set different deletion methods according to different etcdctl versions.
 if [[ ${ETCDCTL_API} == "2" ]]; then
-  etcdctl --endpoints $servers rm -r /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}
+  etcdctl --endpoints $servers rm -r /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}
 else 
-  etcdctl --endpoints $servers del /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME} --prefix
+  etcdctl --endpoints $servers del /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME} --prefix
 fi
 
 if [ $? -eq 0 ]; then
-  echo "Successfully deleted all keys with prefix /vitess/${KB_NAMESPACE}/$KB_CLUSTER_NAME."
+  echo "Successfully deleted all keys with prefix /vitess/${CLUSTER_NAMESPACE}/$CLUSTER_NAME."
 else
   echo "Failed to delete keys. Please check your Etcd server and try again."
   exit 1
diff --git a/addons/apecloud-mysql/scripts/etcd-post-start.sh b/addons/apecloud-mysql/scripts/etcd-post-start.sh
index a7be39053..00c94fb02 100644
--- a/addons/apecloud-mysql/scripts/etcd-post-start.sh
+++ b/addons/apecloud-mysql/scripts/etcd-post-start.sh
@@ -30,17 +30,17 @@ echo $servers
 
 if [[ ${ETCDCTL_API} == "2" ]]; then
   # etcdctl API 2 manages data in a directory-based format, requiring directories to be created in advance.
-  etcdctl --endpoints=${servers} get "/vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/$cell" >/dev/null 2>&1
+  etcdctl --endpoints=${servers} get "/vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/$cell" >/dev/null 2>&1
   if [[ $? -eq 0 ]]; then
     exit 0
   fi
-  echo "add /vitess/$KB_NAMESPACE/$KB_CLUSTER_NAME/global"
-  etcdctl --endpoints=${servers} mkdir /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/global
-  echo "add /vitess/$KB_NAMESPACE/$KB_CLUSTER_NAME/$cell"
-  etcdctl --endpoints=${servers} mkdir /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/$cell
+  echo "add /vitess/$CLUSTER_NAMESPACE/$CLUSTER_NAME/global"
+  etcdctl --endpoints=${servers} mkdir /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/global
+  echo "add /vitess/$CLUSTER_NAMESPACE/$CLUSTER_NAME/$cell"
+  etcdctl --endpoints=${servers} mkdir /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/$cell
 else
   # etcdctl API 3 manages data in key-value pairs, eliminating the need to create additional directories.
-  output=$(etcdctl --endpoints="${servers}" get "/vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/$cell" --prefix --keys-only)
+  output=$(etcdctl --endpoints="${servers}" get "/vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/$cell" --prefix --keys-only)
   if [[ -n $output ]]; then
     exit 0
   fi
@@ -50,8 +50,8 @@ echo "add $cell CellInfo"
 set +e
 vtctl --topo_implementation etcd2 \
   --topo_global_server_address "${servers}" \
-  --topo_global_root "/vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/global" VtctldCommand AddCellInfo \
-  --root "/vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/$cell" \
+  --topo_global_root "/vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/global" VtctldCommand AddCellInfo \
+  --root "/vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/$cell" \
   --server-address "${servers}" \
   $cell
 set -e
\ No newline at end of file
diff --git a/addons/apecloud-mysql/scripts/setup.sh b/addons/apecloud-mysql/scripts/setup.sh
index 6d6a0482c..6a24ce5a4 100755
--- a/addons/apecloud-mysql/scripts/setup.sh
+++ b/addons/apecloud-mysql/scripts/setup.sh
@@ -4,12 +4,12 @@ if [ -z "${__SOURCED__:+x}" ]; then
 set -ex
 fi
 
-# MY_CLUSTER_NAME=clustername
+# CLUSTER_NAME=clustername
 # MY_COMP_NAME=componentname
 # compose headless service name from cluster and component name
 # return: clustername-componentname-headless
 get_service_name() {
-    cluster_name=${MY_CLUSTER_NAME:?missing cluster name}
+    cluster_name=${CLUSTER_NAME:?missing cluster name}
     component_name=${MY_COMP_NAME:?missing component name}
     echo "${cluster_name}-${component_name}-headless"
 }
@@ -55,7 +55,7 @@ generate_cluster_info() {
     echo "KB_MYSQL_N=${KB_MYSQL_N}"
 
     if [ -z "$KB_MYSQL_CLUSTER_UID" ]; then
-        export KB_MYSQL_CLUSTER_UID=${MY_CLUSTER_UID:?missing cluster uid}
+        export KB_MYSQL_CLUSTER_UID=${CLUSTER_UID:?missing cluster uid}
     fi
     echo "KB_MYSQL_CLUSTER_UID=${KB_MYSQL_CLUSTER_UID}"
 
diff --git a/addons/apecloud-mysql/scripts/vtctld.sh b/addons/apecloud-mysql/scripts/vtctld.sh
index a8cc36355..2e4fd06ff 100755
--- a/addons/apecloud-mysql/scripts/vtctld.sh
+++ b/addons/apecloud-mysql/scripts/vtctld.sh
@@ -30,7 +30,7 @@ cell=${CELL:-'zone1'}
 grpc_port=${VTCTLD_GRPC_PORT:-'15999'}
 vtctld_web_port=${VTCTLD_WEB_PORT:-'15000'}
 
-topology_fags="--topo_implementation etcd2 --topo_global_server_address ${endpoints} --topo_global_root /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/global"
+topology_fags="--topo_implementation etcd2 --topo_global_server_address ${endpoints} --topo_global_root /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/global"
 
 VTDATAROOT=$VTDATAROOT/vtctld
 su vitess <<EOF
diff --git a/addons/apecloud-mysql/scripts/vtgate.sh b/addons/apecloud-mysql/scripts/vtgate.sh
index ef964c08d..846c4a492 100755
--- a/addons/apecloud-mysql/scripts/vtgate.sh
+++ b/addons/apecloud-mysql/scripts/vtgate.sh
@@ -24,7 +24,7 @@ fi
 
 echo $endpoints
 
-topology_fags="--topo_implementation etcd2 --topo_global_server_address ${endpoints} --topo_global_root /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/global"
+topology_fags="--topo_implementation etcd2 --topo_global_server_address ${endpoints} --topo_global_root /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/global"
 
 echo "starting vtgate."
 su vitess <<EOF
diff --git a/addons/apecloud-mysql/scripts/vttablet.sh b/addons/apecloud-mysql/scripts/vttablet.sh
index aa70514ef..1064ac6b2 100644
--- a/addons/apecloud-mysql/scripts/vttablet.sh
+++ b/addons/apecloud-mysql/scripts/vttablet.sh
@@ -19,7 +19,7 @@ vtctld_host=${VTCTLD_HOST:-'127.0.0.1'}
 vtctld_web_port=${VTCTLD_WEB_PORT:-'15000'}
 printf -v alias '%s-%010d' $cell $uid
 printf -v tablet_dir 'vt_%010d' $uid
-tablet_hostname=$(eval echo \$KB_"$uid"_HOSTNAME)
+tablet_hostname="$MY_POD_NAME.$MY_COMP_NAME-headless.$CLUSTER_NAMESPACE.svc.cluster.local"
 printf -v tablet_logfile 'vttablet_%010d_querylog.txt' $uid
 
 tablet_type=replica
@@ -44,7 +44,7 @@ fi
 
 echo $endpoints
 
-topology_fags="--topo_implementation etcd2 --topo_global_server_address ${endpoints} --topo_global_root /vitess/${KB_NAMESPACE}/${KB_CLUSTER_NAME}/global"
+topology_fags="--topo_implementation etcd2 --topo_global_server_address ${endpoints} --topo_global_root /vitess/${CLUSTER_NAMESPACE}/${CLUSTER_NAME}/global"
 
 VTDATAROOT=$VTDATAROOT/vttablet
 su vitess <<EOF
diff --git a/addons/apecloud-mysql/templates/_helpers.tpl b/addons/apecloud-mysql/templates/_helpers.tpl
index 358197220..3f3256bb6 100644
--- a/addons/apecloud-mysql/templates/_helpers.tpl
+++ b/addons/apecloud-mysql/templates/_helpers.tpl
@@ -294,11 +294,15 @@ vars:
       componentVarRef:
         optional: false
         replicas: Required
-  - name: MY_CLUSTER_NAME
+  - name: CLUSTER_NAME
     valueFrom:
       clusterVarRef:
         clusterName: Required
-  - name: MY_CLUSTER_UID
+  - name: CLUSTER_NAMESPACE
+    valueFrom:
+      clusterVarRef:
+        namespace: Required
+  - name: CLUSTER_UID
     valueFrom:
       clusterVarRef:
         clusterUID: Required
@@ -347,9 +351,9 @@ env:
   - name: KB_MYSQL_CONF_FILE
     value: "/opt/mysql/my.cnf"
   - name: KB_MYSQL_CLUSTER_UID
-    value: $(KB_CLUSTER_UID)
+    value: $(CLUSTER_UID)
   - name: KB_MYSQL_N
-    value: $(KB_COMP_REPLICAS)
+    value: $(MY_COMP_REPLICAS)
   - name: CLUSTER_DOMAIN
     value: {{ .Values.clusterDomain }}
   - name: MY_POD_NAME
@@ -406,7 +410,7 @@ env:
     value: "15100"
   - name: VTTABLET_GRPC_PORT
   - name: VTCTLD_HOST
-    value: "$(KB_CLUSTER_NAME)-wescale-ctrl-headless"
+    value: "$(CLUSTER_NAME)-wescale-ctrl-headless"
   - name: VTCTLD_WEB_PORT
     value: "15000"
   - name: SERVICE_PORT
diff --git a/addons/apecloud-mysql/templates/cmpd-wescale-controller.yaml b/addons/apecloud-mysql/templates/cmpd-wescale-controller.yaml
index 4ffb2d0db..faccc57f9 100644
--- a/addons/apecloud-mysql/templates/cmpd-wescale-controller.yaml
+++ b/addons/apecloud-mysql/templates/cmpd-wescale-controller.yaml
@@ -42,7 +42,7 @@ spec:
           - name: CELL
             value: {{ .Values.wesqlscale.cell | default "zone1" | quote }}
           - name: VTCTLD_SERVER
-            value: "$(KB_CLUSTER_NAME)-wescale-ctrl-headless"
+            value: "$(CLUSTER_NAME)-wescale-ctrl-headless"
           - name: VTCTLD_WEB_PORT
             value: "15000"
           - name: VTCTLD_GRPC_PORT
@@ -56,6 +56,18 @@ spec:
           - name: data
             mountPath: /vtdataroot
   vars:
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
+    - name: CLUSTER_NAMESPACE
+      valueFrom:
+        clusterVarRef:
+          namespace: Required
+    - name: CLUSTER_UID
+      valueFrom:
+        clusterVarRef:
+          clusterUID: Required
     - name: MYSQL_ROOT_USER
       valueFrom:
         credentialVarRef:
diff --git a/addons/apecloud-mysql/templates/cmpd-wescale.yaml b/addons/apecloud-mysql/templates/cmpd-wescale.yaml
index 7570d2f8e..73c843d77 100644
--- a/addons/apecloud-mysql/templates/cmpd-wescale.yaml
+++ b/addons/apecloud-mysql/templates/cmpd-wescale.yaml
@@ -83,6 +83,18 @@ spec:
     scrapePath: /metrics
     scrapePort: webport
   vars:
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
+    - name: CLUSTER_NAMESPACE
+      valueFrom:
+        clusterVarRef:
+          namespace: Required
+    - name: CLUSTER_UID
+      valueFrom:
+        clusterVarRef:
+          clusterUID: Required
     - name: MYSQL_USER
       valueFrom:
         credentialVarRef:
diff --git a/addons/apecloud-postgresql/templates/_helpers.tpl b/addons/apecloud-postgresql/templates/_helpers.tpl
index c9075bd4e..f7d2b3dfc 100644
--- a/addons/apecloud-postgresql/templates/_helpers.tpl
+++ b/addons/apecloud-postgresql/templates/_helpers.tpl
@@ -184,7 +184,7 @@ vars:
         password: Required
   # env for syncer to initialize dcs
   # TODO: modify these env for syncer
-  - name: MY_CLUSTER_NAME
+  - name: CLUSTER_NAME
     valueFrom:
       clusterVarRef:
         clusterName: Required
diff --git a/addons/etcd/dataprotection/backup.sh b/addons/etcd/dataprotection/backup.sh
index 81bb0c71e..8712c6837 100644
--- a/addons/etcd/dataprotection/backup.sh
+++ b/addons/etcd/dataprotection/backup.sh
@@ -15,7 +15,7 @@ handle_exit() {
 trap handle_exit EXIT
 
 # use etcdctl create snapshot
-ENDPOINTS=${DP_DB_HOST}.${KB_NAMESPACE}.svc${CLUSTER_DOMAIN}:2379
+ENDPOINTS=${DP_DB_HOST}.${CLUSTER_NAMESPACE}.svc${CLUSTER_DOMAIN}:2379
 exec_etcdctl "${ENDPOINTS}" snapshot save "${DP_BACKUP_NAME}"
 # check the backup file, make sure it is not empty
 if check_backup_file "${DP_BACKUP_NAME}"; then
diff --git a/addons/etcd/dataprotection/restore.sh b/addons/etcd/dataprotection/restore.sh
index 8b2053f9e..18c9fa7b0 100644
--- a/addons/etcd/dataprotection/restore.sh
+++ b/addons/etcd/dataprotection/restore.sh
@@ -12,7 +12,7 @@ if [ "$(datasafed list "${remote_backup_file}")" = "${remote_backup_file}" ]; th
 fi
 
 backup_file=${restore_dir}/${DP_BACKUP_NAME}
-endpoint=${DP_DB_HOST}.${KB_NAMESPACE}.svc${CLUSTER_DOMAIN}:2379
+endpoint=${DP_DB_HOST}.${CLUSTER_NAMESPACE}.svc${CLUSTER_DOMAIN}:2379
 
 if check_backup_file "${backup_file}"; then
   echo "Backup file is valid"
diff --git a/addons/kafka/templates/cmpd-broker-27.yaml b/addons/kafka/templates/cmpd-broker-27.yaml
index 186e8bd48..cfec574c6 100644
--- a/addons/kafka/templates/cmpd-broker-27.yaml
+++ b/addons/kafka/templates/cmpd-broker-27.yaml
@@ -59,6 +59,11 @@ spec:
         componentVarRef:
           optional: false
           componentName: Required
+    - name: COMPONENT_REPLICAS
+      valueFrom:
+        componentVarRef:
+          optional: false
+          replicas: Required
     - name: CLUSTER_NAME
       valueFrom:
         clusterVarRef:
diff --git a/addons/kafka/templates/cmpd-broker.yaml b/addons/kafka/templates/cmpd-broker.yaml
index 621fce44c..3a0a13888 100644
--- a/addons/kafka/templates/cmpd-broker.yaml
+++ b/addons/kafka/templates/cmpd-broker.yaml
@@ -65,6 +65,11 @@ spec:
         componentVarRef:
           optional: false
           componentName: Required
+    - name: COMPONENT_REPLICAS
+      valueFrom:
+        componentVarRef:
+          optional: false
+          replicas: Required
     ## Todo: currently only nodeport and clusterIp network modes are supported. LoadBalance is not supported yet and needs future support.
     - name: BROKER_ADVERTISED_PORT
       valueFrom:
diff --git a/addons/kafka/templates/cmpd-combine.yaml b/addons/kafka/templates/cmpd-combine.yaml
index a52a22d8c..c3ba5c2b0 100644
--- a/addons/kafka/templates/cmpd-combine.yaml
+++ b/addons/kafka/templates/cmpd-combine.yaml
@@ -56,6 +56,11 @@ spec:
         componentVarRef:
           optional: false
           componentName: Required
+    - name: COMPONENT_REPLICAS
+      valueFrom:
+        componentVarRef:
+          optional: false
+          replicas: Required
     ## Todo: currently only nodeport and clusterIp network modes are supported. LoadBalance is not supported yet and needs future support.
     - name: BROKER_ADVERTISED_PORT
       valueFrom:
diff --git a/addons/kafka/templates/cmpd-controller.yaml b/addons/kafka/templates/cmpd-controller.yaml
index db49912e6..d22db1308 100644
--- a/addons/kafka/templates/cmpd-controller.yaml
+++ b/addons/kafka/templates/cmpd-controller.yaml
@@ -37,6 +37,11 @@ spec:
         componentVarRef:
           optional: false
           componentName: Required
+    - name: COMPONENT_REPLICAS
+      valueFrom:
+        componentVarRef:
+          optional: false
+          replicas: Required
   ## serial is not used because rsm currently does not support kafka's role detection. The lack of role label during restart will affect the pod restart.
   updateStrategy: BestEffortParallel
   configs:
diff --git a/addons/kafka/templates/opsdefinitions/quota.yaml b/addons/kafka/templates/opsdefinitions/quota.yaml
index 383333338..e8b87b370 100644
--- a/addons/kafka/templates/opsdefinitions/quota.yaml
+++ b/addons/kafka/templates/opsdefinitions/quota.yaml
@@ -62,7 +62,7 @@ spec:
                 - |
                   set -e
                   SERVERS=()
-                  for i in $(seq 0 $((${KB_COMP_REPLICAS}-1))); do
+                  for i in $(seq 0 $((${COMPONENT_REPLICAS}-1))); do
                     SERVERS+=("${KB_COMP_SVC_NAME}-${i}:${KB_COMP_SVC_PORT_BROKER}")
                   done
                   KB_CONNECT_ENDPOINT=$(printf "%s," "${SERVERS[@]}")
diff --git a/addons/kafka/templates/opsdefinitions/topic.yaml b/addons/kafka/templates/opsdefinitions/topic.yaml
index 9e286fbf7..efe6d22b4 100644
--- a/addons/kafka/templates/opsdefinitions/topic.yaml
+++ b/addons/kafka/templates/opsdefinitions/topic.yaml
@@ -67,7 +67,7 @@ spec:
                 - |
                   set -e
                   SERVERS=()
-                  for i in $(seq 0 $((${KB_COMP_REPLICAS}-1))); do
+                  for i in $(seq 0 $((${COMPONENT_REPLICAS}-1))); do
                     SERVERS+=("${KB_COMP_SVC_NAME}-${i}:${KB_COMP_SVC_PORT_BROKER}")
                   done
                   KB_CONNECT_ENDPOINT=$(printf "%s," "${SERVERS[@]}")
diff --git a/addons/kafka/templates/opsdefinitions/useracl.yaml b/addons/kafka/templates/opsdefinitions/useracl.yaml
index 9f7f687a8..0afc1b15a 100644
--- a/addons/kafka/templates/opsdefinitions/useracl.yaml
+++ b/addons/kafka/templates/opsdefinitions/useracl.yaml
@@ -108,7 +108,7 @@ spec:
             - |
               set -e
               SERVERS=()
-              for i in $(seq 0 $((${KB_COMP_REPLICAS}-1))); do
+              for i in $(seq 0 $((${COMPONENT_REPLICAS}-1))); do
                 SERVERS+=("${KB_COMP_SVC_NAME}-${i}:${KB_COMP_SVC_PORT_BROKER}")
               done
               KB_CONNECT_ENDPOINT=$(printf "%s," "${SERVERS[@]}")
diff --git a/addons/milvus/configs/cluster-user.yaml b/addons/milvus/configs/cluster-user.yaml
index 4dbff11d6..6b88e2949 100644
--- a/addons/milvus/configs/cluster-user.yaml
+++ b/addons/milvus/configs/cluster-user.yaml
@@ -1,19 +1,19 @@
 etcd:
   endpoints:
     - {{ .ETCD_ENDPOINT }}
-  rootPath: {{ .KB_CLUSTER_NAME }}
+  rootPath: {{ .CLUSTER_NAME }}
 messageQueue: pulsar
 minio:
   address: {{ .MINIO_SERVER }}
   port: {{ .MINIO_PORT }}
   accessKeyID: MINIO_ACCESS_KEY
   secretAccessKey: MINIO_SECRET_KEY
-  bucketName: {{ .KB_CLUSTER_NAME }}
+  bucketName: {{ .CLUSTER_NAME }}
 mq:
   type: pulsar
 msgChannel:
   chanNamePrefix:
-    cluster: {{ .KB_CLUSTER_NAME }}
+    cluster: {{ .CLUSTER_NAME }}
 pulsar:
   address: {{ .PULSAR_SERVER }}
   port: {{ .PULSAR_PORT }}
diff --git a/addons/milvus/configs/standalone-user.yaml b/addons/milvus/configs/standalone-user.yaml
index 565549782..2d6bd1e4f 100644
--- a/addons/milvus/configs/standalone-user.yaml
+++ b/addons/milvus/configs/standalone-user.yaml
@@ -1,15 +1,15 @@
 etcd:
   endpoints:
-  - {{ .KB_CLUSTER_NAME }}-etcd-headless.{{ .KB_NAMESPACE }}.svc.cluster.local:2379
-  rootPath: {{ .KB_CLUSTER_NAME }}
+  - {{ .CLUSTER_NAME }}-etcd-headless.{{ .CLUSTER_NAMESPACE }}.svc.cluster.local:2379
+  rootPath: {{ .CLUSTER_NAME }}
 messageQueue: rocksmq
 minio:
-  address: {{ .KB_CLUSTER_NAME }}-minio-headless.{{ .KB_NAMESPACE }}.svc.cluster.local
-  bucketName: {{ .KB_CLUSTER_NAME }}
+  address: {{ .CLUSTER_NAME }}-minio-headless.{{ .CLUSTER_NAMESPACE }}.svc.cluster.local
+  bucketName: {{ .CLUSTER_NAME }}
   port: 9000
   accessKeyID: MINIO_ACCESS_KEY
   secretAccessKey: MINIO_SECRET_KEY
 msgChannel:
   chanNamePrefix:
-    cluster: {{ .KB_CLUSTER_NAME }}
+    cluster: {{ .CLUSTER_NAME }}
   rocksmq: {}
diff --git a/addons/milvus/templates/_helpers.tpl b/addons/milvus/templates/_helpers.tpl
index 37315836c..c2664d9c2 100644
--- a/addons/milvus/templates/_helpers.tpl
+++ b/addons/milvus/templates/_helpers.tpl
@@ -400,6 +400,14 @@ Milvus cluster external storage services reference
 Milvus cluster vars for external storage services reference
 */}}
 {{- define "milvus.cluster.serviceRefVars" }}
+- name: CLUSTER_NAME
+  valueFrom:
+    clusterVarRef:
+      clusterName: Required
+- name: CLUSTER_NAMESPACE
+  valueFrom:
+    clusterVarRef:
+      namespace: Required
 - name: ETCD_ENDPOINT
   valueFrom:
     serviceRefVarRef:
diff --git a/addons/mongodb/templates/componentdefinition.yaml b/addons/mongodb/templates/componentdefinition.yaml
index 8856d9cc0..22a7c1e94 100644
--- a/addons/mongodb/templates/componentdefinition.yaml
+++ b/addons/mongodb/templates/componentdefinition.yaml
@@ -172,6 +172,14 @@ spec:
           type: DirectoryOrCreate
       {{- end }}
   vars:
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
+    - name: CLUSTER_NAMESPACE
+      valueFrom:
+        clusterVarRef:
+          namespace: Required
     - name: MONGODB_USER
       valueFrom:
         credentialVarRef:
diff --git a/addons/mongodb/templates/scriptstemplate.yaml b/addons/mongodb/templates/scriptstemplate.yaml
index a8ad98a24..bfe597baa 100644
--- a/addons/mongodb/templates/scriptstemplate.yaml
+++ b/addons/mongodb/templates/scriptstemplate.yaml
@@ -9,8 +9,8 @@ data:
     #!/bin/sh
     
     PORT=27018 
-    CONFIG_SVR_NAME=$KB_CLUSTER_NAME"-configsvr"
-    DOMAIN=$CONFIG_SVR_NAME"-headless."$KB_NAMESPACE".svc.cluster.local"
+    CONFIG_SVR_NAME=$CLUSTER_NAME"-configsvr"
+    DOMAIN=$CONFIG_SVR_NAME"-headless."$CLUSTER_NAMESPACE".svc.cluster.local"
     mongos --bind_ip_all --configdb $CONFIG_SVR_NAME/$CONFIG_SVR_NAME"-0."$DOMAIN:$PORT,$CONFIG_SVR_NAME"-1."$DOMAIN:$PORT,$CONFIG_SVR_NAME"-2."$DOMAIN:$PORT
   replicaset-setup.sh: |-
     #!/bin/sh
diff --git a/addons/mysql/scripts/init-mysql-instance-for-orc.sh b/addons/mysql/scripts/init-mysql-instance-for-orc.sh
index 90b101e3e..e9ffed6e4 100644
--- a/addons/mysql/scripts/init-mysql-instance-for-orc.sh
+++ b/addons/mysql/scripts/init-mysql-instance-for-orc.sh
@@ -28,7 +28,7 @@ topology_password="$ORC_TOPOLOGY_PASSWORD"
 
 # create orchestrator user in mysql
 create_mysql_user() {
-  local service_name=$(echo "${KB_CLUSTER_COMP_NAME}_MYSQL_${i}" | tr '-' '_' | tr '[:lower:]' '[:upper:]')
+  local service_name=$(echo "${COMPONENT_NAME}_MYSQL_${i}" | tr '-' '_' | tr '[:lower:]' '[:upper:]')
 
   mysql_note "Create MySQL User and Grant Permissions..."
 
@@ -63,7 +63,7 @@ EOF
   mysql -P 3306 -u $MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD << EOF
 USE kb_orc_meta_cluster;
 INSERT INTO kb_orc_meta_cluster (anchor,host_name,cluster_name, cluster_domain, data_center)
-VALUES (1, '$service_name', '$KB_CLUSTER_NAME', '', '')
+VALUES (1, '$service_name', '$CLUSTER_NAME', '', '')
 ON DUPLICATE KEY UPDATE
     cluster_name = VALUES(cluster_name),
     cluster_domain = VALUES(cluster_domain),
@@ -104,12 +104,12 @@ setup_master_slave() {
 
   master_fqdn=${replicas[0]}
   master_last_digit=${master_fqdn##*-}
-  master_host=$(echo "${KB_CLUSTER_COMP_NAME}_MYSQL_${master_last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
+  master_host=$(echo "${COMPONENT_NAME}_MYSQL_${master_last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
   master_from_orc=""
   get_master_from_orc
 
   self_last_digit=${SYNCER_POD_NAME##*-}
-  self_service_name=$(echo "${KB_CLUSTER_COMP_NAME}_MYSQL_${self_last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
+  self_service_name=$(echo "${COMPONENT_NAME}_MYSQL_${self_last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
 
   # If the cluster is already registered to the Orchestrator and the Master of the cluster is itself, then no action is required.
   if [ "$master_from_orc" == "${self_service_name}" ]; then
@@ -151,7 +151,7 @@ get_master_from_orc() {
       return 0
     fi
 
-    topology_info=$(/scripts/orchestrator-client -c topology -i $KB_CLUSTER_NAME) || true
+    topology_info=$(/scripts/orchestrator-client -c topology -i $CLUSTER_NAME) || true
     if [[ $topology_info == "" ]]; then
       return 0
     fi
diff --git a/addons/mysql/scripts/mysql-entrypoint.sh b/addons/mysql/scripts/mysql-entrypoint.sh
index d783ef1ef..d68c7fef4 100644
--- a/addons/mysql/scripts/mysql-entrypoint.sh
+++ b/addons/mysql/scripts/mysql-entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-REPORT_HOST=${KB_CLUSTER_COMP_NAME}-mysql-${SYNCER_POD_NAME##*-}
+REPORT_HOST=${COMPONENT_NAME}-mysql-${SYNCER_POD_NAME##*-}
 SERVICE_ID=$((${SYNCER_POD_NAME##*-} + 1))
 if [ "${MYSQL_MAJOR}" = '5.7' ]; then
   docker-entrypoint.sh mysqld --server-id $SERVICE_ID --report-host ${REPORT_HOST} \
diff --git a/addons/mysql/scripts/mysql-orchestrator-register.sh b/addons/mysql/scripts/mysql-orchestrator-register.sh
index 87fa624e0..56eb97d40 100644
--- a/addons/mysql/scripts/mysql-orchestrator-register.sh
+++ b/addons/mysql/scripts/mysql-orchestrator-register.sh
@@ -43,7 +43,7 @@ register_first_mysql_instance() {
   IFS=',' read -r -a replicas <<< "${MYSQL_POD_FQDN_LIST}"
   fqdn_name=${replicas[0]}
   last_digit=${fqdn_name##*-}
-  first_mysql_instance=${KB_CLUSTER_COMP_NAME}-mysql-${last_digit}.${KB_NAMESPACE}
+  first_mysql_instance=${COMPONENT_NAME}-mysql-${last_digit}.${CLUSTER_NAMESPACE}
   register_to_orchestrator "$first_mysql_instance"
 
   echo "Initialization script completed！"
diff --git a/addons/mysql/templates/_helpers.tpl b/addons/mysql/templates/_helpers.tpl
index ea6ec197d..1e3496655 100644
--- a/addons/mysql/templates/_helpers.tpl
+++ b/addons/mysql/templates/_helpers.tpl
@@ -83,7 +83,6 @@ provider: kubeblocks
 serviceKind: mysql
 description: mysql component definition for Kubernetes
 updateStrategy: BestEffortParallel
-
 services:
   - name: default
     roleSelector: primary
@@ -92,7 +91,6 @@ services:
         - name: mysql
           port: 3306
           targetPort: mysql
-
 scripts:
   - name: mysql-scripts
     templateRef: mysql-scripts
@@ -111,12 +109,19 @@ systemAccounts:
       numSymbols: 0
       letterCase: MixedCases
 vars:
+  - name: CLUSTER_NAME
+    valueFrom:
+      clusterVarRef:
+        clusterName: Required
+  - name: CLUSTER_NAMESPACE
+    valueFrom:
+      clusterVarRef:
+        namespace: Required
   - name: MYSQL_ROOT_USER
     valueFrom:
       credentialVarRef:
         name: root
         username: Required
-
   - name: MYSQL_ROOT_PASSWORD
     valueFrom:
       credentialVarRef:
@@ -182,13 +187,11 @@ provider: kubeblocks
 description: mysql component definition for Kubernetes
 serviceKind: mysql
 updateStrategy: BestEffortParallel
-
 serviceRefDeclarations:
   - name: orchestrator
     serviceRefDeclarationSpecs:
       - serviceKind: orchestrator
         serviceVersion: "^*"
-
 services:
   - name: mysql-server
     serviceName: mysql-server
@@ -205,7 +208,6 @@ services:
         - name: mysql
           port: 3306
           targetPort: mysql
-
 scripts:
   - name: mysql-scripts
     templateRef: mysql-scripts
@@ -215,7 +217,6 @@ scripts:
 volumes:
   - name: data
     needSnapshot: true
-
 systemAccounts:
   - name: root
     initAccount: true
@@ -224,7 +225,6 @@ systemAccounts:
       numDigits: 5
       numSymbols: 0
       letterCase: MixedCases
-
 roles:
   - name: primary
     serviceable: true
@@ -232,26 +232,35 @@ roles:
   - name: secondary
     serviceable: true
     writable: false
-
 vars:
+  - name: CLUSTER_NAME
+    valueFrom:
+      clusterVarRef:
+        clusterName: Required
+  - name: CLUSTER_NAMESPACE
+    valueFrom:
+      clusterVarRef:
+        namespace: Required
+  - name: COMPONENT_NAME
+    valueFrom:
+      componentVarRef:
+        optional: false
+        componentName: Required
   - name: MYSQL_ROOT_USER
     valueFrom:
       credentialVarRef:
         name: root
         username: Required
-
   - name: MYSQL_ROOT_PASSWORD
     valueFrom:
       credentialVarRef:
         name: root
         password: Required
-
   - name: ORC_ENDPOINTS
     valueFrom:
       serviceRefVarRef:
         name: orchestrator
         endpoint: Required
-
   - name: ORC_PORTS
     valueFrom:
       serviceRefVarRef:
@@ -264,7 +273,6 @@ vars:
       componentVarRef:
         optional: false
         podNames: Required
-
 exporter:
   containerName: mysql-exporter
   scrapePath: /metrics
@@ -282,7 +290,7 @@ roleProbe:
       - /bin/bash
       - -c
       - |
-        topology_info=$(/kubeblocks/orchestrator-client -c topology -i $KB_CLUSTER_NAME) || true
+        topology_info=$(/kubeblocks/orchestrator-client -c topology -i $CLUSTER_NAME) || true
         if [[ $topology_info == "" ]]; then
           echo -n "secondary"
           exit 0
@@ -299,7 +307,7 @@ roleProbe:
         address_port=$(echo "$first_line" | awk '{print $1}')
         master_from_orc="${address_port%:*}"
         last_digit=${KB_AGENT_POD_NAME##*-}
-        self_service_name=$(echo "${KB_CLUSTER_COMP_NAME}_mysql_${last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
+        self_service_name=$(echo "${COMPONENT_NAME}_mysql_${last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
         if [ "$master_from_orc" == "${self_service_name}" ]; then
           echo -n "primary"
         else
@@ -312,11 +320,11 @@ memberLeave:
       - -c
       - |
         set +e
-        master_from_orc=$(/kubeblocks/orchestrator-client -c which-cluster-master -i $KB_CLUSTER_NAME)
+        master_from_orc=$(/kubeblocks/orchestrator-client -c which-cluster-master -i $CLUSTER_NAME)
         last_digit=${KB_LEAVE_MEMBER_POD_NAME##*-}
-        self_service_name=$(echo "${KB_CLUSTER_COMP_NAME}_mysql_${last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
+        self_service_name=$(echo "${COMPONENT_NAME}_mysql_${last_digit}" | tr '_' '-' | tr '[:upper:]' '[:lower:]' )
         if [ "${self_service_name%%:*}" == "${master_from_orc%%:*}" ]; then
-          /kubeblocks/orchestrator-client -c force-master-failover -i $KB_CLUSTER_NAME
+          /kubeblocks/orchestrator-client -c force-master-failover -i $CLUSTER_NAME
           local timeout=30
           local start_time=$(date +%s)
           local current_time
@@ -325,7 +333,7 @@ memberLeave:
             if [ $((current_time - start_time)) -gt $timeout ]; then
               break
             fi
-            master_from_orc=$(/kubeblocks/orchestrator-client -c which-cluster-master -i $KB_CLUSTER_NAME)
+            master_from_orc=$(/kubeblocks/orchestrator-client -c which-cluster-master -i $CLUSTER_NAME)
             if [ "${self_service_name%%:*}" != "${master_from_orc%%:*}" ]; then
               break
             fi
diff --git a/addons/mysql/templates/cmpd-mysql57-orc.yaml b/addons/mysql/templates/cmpd-mysql57-orc.yaml
index d2e5c6ae6..bbaefcd02 100644
--- a/addons/mysql/templates/cmpd-mysql57-orc.yaml
+++ b/addons/mysql/templates/cmpd-mysql57-orc.yaml
@@ -26,7 +26,7 @@ spec:
         command:
           - bash
           - -c
-          - curl http://${ORC_ENDPOINTS%%:*}:${ORC_PORTS}/api/forget-cluster/${KB_CLUSTER_NAME} || true
+          - curl http://${ORC_ENDPOINTS%%:*}:${ORC_PORTS}/api/forget-cluster/${CLUSTER_NAME} || true
   configs:
     - name: mysql-replication-config
       templateRef: mysql-5.7-config-template
diff --git a/addons/mysql/templates/cmpd-mysql57.yaml b/addons/mysql/templates/cmpd-mysql57.yaml
index 2c5bb4abe..3ec31e75f 100644
--- a/addons/mysql/templates/cmpd-mysql57.yaml
+++ b/addons/mysql/templates/cmpd-mysql57.yaml
@@ -9,7 +9,6 @@ metadata:
 spec:
   {{- include "mysql.spec.common" . | nindent 2 }}
   serviceVersion: 5.7.44
-
   configs:
     - name: mysql-replication-config
       templateRef: mysql-5.7-config-template
diff --git a/addons/mysql/templates/cmpd-mysql80-orc.yaml b/addons/mysql/templates/cmpd-mysql80-orc.yaml
index 019642be2..5e63fb2b4 100644
--- a/addons/mysql/templates/cmpd-mysql80-orc.yaml
+++ b/addons/mysql/templates/cmpd-mysql80-orc.yaml
@@ -26,7 +26,7 @@ spec:
         command:
           - bash
           - -c
-          - curl http://${ORC_ENDPOINTS%%:*}:${ORC_PORTS}/api/forget-cluster/${KB_CLUSTER_NAME} || true
+          - curl http://${ORC_ENDPOINTS%%:*}:${ORC_PORTS}/api/forget-cluster/${CLUSTER_NAME} || true
   configs:
     - name: mysql-replication-config
       templateRef: mysql-8.0-config-template
diff --git a/addons/mysql/templates/cmpd-mysql80.yaml b/addons/mysql/templates/cmpd-mysql80.yaml
index 806159edf..f30337473 100644
--- a/addons/mysql/templates/cmpd-mysql80.yaml
+++ b/addons/mysql/templates/cmpd-mysql80.yaml
@@ -9,7 +9,6 @@ metadata:
 spec:
   {{- include "mysql.spec.common" . | nindent 2 }}
   serviceVersion: 8.0.33
-
   configs:
     - name: mysql-replication-config
       templateRef: mysql-8.0-config-template
diff --git a/addons/mysql/templates/cmpd-mysql84.yaml b/addons/mysql/templates/cmpd-mysql84.yaml
index aefa59122..5e970dcba 100644
--- a/addons/mysql/templates/cmpd-mysql84.yaml
+++ b/addons/mysql/templates/cmpd-mysql84.yaml
@@ -9,7 +9,6 @@ metadata:
 spec:
   {{- include "mysql.spec.common" . | nindent 2 }}
   serviceVersion: 8.4.2
-
   configs:
     - name: mysql-replication-config
       templateRef: mysql-8.0-config-template
diff --git a/addons/mysql/templates/cmpd-proxysql.yaml b/addons/mysql/templates/cmpd-proxysql.yaml
index 257da0618..9a985e9f1 100644
--- a/addons/mysql/templates/cmpd-proxysql.yaml
+++ b/addons/mysql/templates/cmpd-proxysql.yaml
@@ -12,7 +12,6 @@ spec:
   serviceKind: proxysql
   serviceVersion: 2.4.4
   updateStrategy: BestEffortParallel
-
   configs:
     - name: proxy-config
       templateRef: proxysql-config
@@ -20,18 +19,12 @@ spec:
       volumeName: proxy-config
       reRenderResourceTypes:
         - hscale
-      {{/*
-      injectEnvTo:
-        - proxysql
-        - proxy
-        */}}
   scripts:
     - name: proxysql-scripts
       templateRef: proxysql-scripts
       namespace: {{ .Release.Namespace }}
       volumeName: proxysql-scripts
       defaultMode: 0555
-
   services:
     - name: proxy-server
       serviceName: proxy-server
@@ -52,6 +45,19 @@ spec:
             port: 6033
             targetPort: db
   vars:
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
+    - name: CLUSTER_NAMESPACE
+      valueFrom:
+        clusterVarRef:
+          namespace: Required
+    - name: COMPONENT_NAME
+      valueFrom:
+        componentVarRef:
+          optional: false
+          componentName: Required
     - name: BACKEND_SERVER
       valueFrom:
         serviceVarRef:
@@ -59,7 +65,6 @@ spec:
           name: mysql-server
           host: Required
           optional: false
-
     - name: MYSQL_ROOT_USER
       valueFrom:
         credentialVarRef:
@@ -67,7 +72,6 @@ spec:
           compDef: {{ include "mysql.componentDefRegex" . }}
           name: root
           username: Required
-
     - name: MYSQL_ROOT_PASSWORD
       valueFrom:
         credentialVarRef:
@@ -75,7 +79,6 @@ spec:
           compDef: {{ include "mysql.componentDefRegex" . }}
           name: root
           password: Required
-
     - name: MYSQL_PORT
       valueFrom:
         serviceVarRef:
@@ -85,7 +88,6 @@ spec:
           port:
             name: mysql
             option: Required
-
   runtime:
     volumes:
     containers:
diff --git a/addons/orchestrator/scripts/startup.sh b/addons/orchestrator/scripts/startup.sh
index 232dd004c..def48be7f 100644
--- a/addons/orchestrator/scripts/startup.sh
+++ b/addons/orchestrator/scripts/startup.sh
@@ -12,7 +12,7 @@ ORC_META_DATABASE=${ORC_META_DATABASE:-orchestrator}
 mkdir -p $WORKDIR
 mkdir -p $WORKDIR/raft $WORKDIR/sqlite
 
-SUBDOMAIN=${KB_CLUSTER_COMP_NAME}-headless.${KB_NAMESPACE}.svc.cluster.local
+SUBDOMAIN=${COMPONENT_NAME}-headless.${CLUSTER_NAMESPACE}.svc.cluster.local
 replicas=$(eval echo ${ORC_POD_FQDN_LIST} | tr ',' '\n')
 PEERS=""
 for replica in ${replicas}; do
diff --git a/addons/orchestrator/templates/cmpd-raft.yaml b/addons/orchestrator/templates/cmpd-raft.yaml
index 739c56ae2..8f17f171d 100644
--- a/addons/orchestrator/templates/cmpd-raft.yaml
+++ b/addons/orchestrator/templates/cmpd-raft.yaml
@@ -17,15 +17,25 @@ spec:
       serviceable: true
       writable: false
       votable: true
-
   vars:
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
+    - name: CLUSTER_NAMESPACE
+      valueFrom:
+        clusterVarRef:
+          namespace: Required
+    - name: CLUSTER_UID
+      valueFrom:
+        clusterVarRef:
+          clusterUID: Required
     - name: ORC_POD_FQDN_LIST
       valueFrom:
         componentVarRef:
           compDef: {{ include "orchestrator.componentDefName" . }}
           optional: false
           podFQDNs: Required
-
   lifecycleActions:
     roleProbe:
       exec:
@@ -42,7 +52,6 @@ spec:
             else
               echo -n ""
             fi
-
   services:
     - name: orchestrator
       roleSelector: primary
@@ -51,7 +60,6 @@ spec:
           - name: orc-http
             port: 80
             targetPort: orc-http
-
   runtime:
     containers:
       - name: orchestrator
diff --git a/addons/orchestrator/templates/cmpd-shareend.yaml b/addons/orchestrator/templates/cmpd-shareend.yaml
index 410dcd4d2..0000de086 100644
--- a/addons/orchestrator/templates/cmpd-shareend.yaml
+++ b/addons/orchestrator/templates/cmpd-shareend.yaml
@@ -20,8 +20,19 @@ spec:
       serviceRefDeclarationSpecs:
         - serviceKind: mysql
           serviceVersion: "^*"
-
   vars:
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
+    - name: CLUSTER_NAMESPACE
+      valueFrom:
+        clusterVarRef:
+          namespace: Required
+    - name: CLUSTER_UID
+      valueFrom:
+        clusterVarRef:
+          clusterUID: Required
     - name: META_MYSQL_PORT
       valueFrom:
         serviceRefVarRef:
@@ -42,7 +53,6 @@ spec:
         serviceRefVarRef:
           name: metadb
           password: Required
-
   runtime:
     initContainers:
       - name: init-meta-database
diff --git a/addons/postgresql/dataprotection/wal-g-backup.sh b/addons/postgresql/dataprotection/wal-g-backup.sh
index e312535fb..7c501cab1 100644
--- a/addons/postgresql/dataprotection/wal-g-backup.sh
+++ b/addons/postgresql/dataprotection/wal-g-backup.sh
@@ -49,7 +49,7 @@ echo "Full backup using WAL-G: DONE"
 
 set +e
 echo "switch wal log"
-PSQL="psql -h ${KB_CLUSTER_NAME}-${KB_COMP_NAME} -U ${DP_DB_USER} -d postgres"
+PSQL="psql -h ${CLUSTER_NAME}-${POSTGRES_COMPONENT_NAME} -U ${DP_DB_USER} -d postgres"
 ${PSQL} -c "select pg_switch_wal();"
 
 # 2. get backup name of the wal-g
diff --git a/addons/rabbitmq/config/rabbitmq-config.tpl b/addons/rabbitmq/config/rabbitmq-config.tpl
index 3845beb16..87f686c0a 100644
--- a/addons/rabbitmq/config/rabbitmq-config.tpl
+++ b/addons/rabbitmq/config/rabbitmq-config.tpl
@@ -45,7 +45,7 @@ cluster_formation.peer_discovery_backend   = rabbit_peer_discovery_k8s
 cluster_formation.k8s.host                 = kubernetes.default
 cluster_formation.k8s.address_type         = hostname
 # cluster_formation.target_cluster_size_hint = 1
-cluster_formation.k8s.service_name         = {{ .KB_CLUSTER_NAME }}-rabbitmq-headless
-cluster_name                               = {{ .KB_CLUSTER_NAME }}
+cluster_formation.k8s.service_name         = {{ .CLUSTER_NAME }}-rabbitmq-headless
+cluster_name                               = {{ .CLUSTER_NAME }}
 
 listeners.tcp.1 = :::{{ $rabbitmq_port }}
diff --git a/addons/rabbitmq/templates/componentdefinition.yaml b/addons/rabbitmq/templates/componentdefinition.yaml
index 558533d4e..93f5c32fb 100644
--- a/addons/rabbitmq/templates/componentdefinition.yaml
+++ b/addons/rabbitmq/templates/componentdefinition.yaml
@@ -150,6 +150,14 @@ spec:
             name: rabbitmq-config
             subPath: enabled_plugins
   vars:
+    - name: CLUSTER_NAME
+      valueFrom:
+        clusterVarRef:
+          clusterName: Required
+    - name: CLUSTER_NAMESPACE
+      valueFrom:
+        clusterVarRef:
+          namespace: Required
     - name: RABBITMQ_DEFAULT_USER
       valueFrom:
         credentialVarRef:
diff --git a/examples/kafka/cluster-2x-ext-zk-svc-descriptor.yaml b/examples/kafka/cluster-2x-ext-zk-svc-descriptor.yaml
index bbfbe32d9..ad88471d9 100644
--- a/examples/kafka/cluster-2x-ext-zk-svc-descriptor.yaml
+++ b/examples/kafka/cluster-2x-ext-zk-svc-descriptor.yaml
@@ -43,7 +43,7 @@ spec:
         - name: KAFKA_HEAP_OPTS
           value: "-Xmx500m -Xms500m"
         - name: KB_KAFKA_ZK_SUB_PATH
-          value: "test"   # set sub path to use for sharing zk, default value is $(KB_CLUSTER_NAME), set empty string for root
+          value: "test"   # set sub path to use for sharing zk, default value is $(CLUSTER_NAME), set empty string for root
       resources:
         limits:
           cpu: '0.5'