diff --git a/helm-charts/common/chatqna-ui/Chart.yaml b/helm-charts/common/chatqna-ui/Chart.yaml
index fe0cc078c..755fc5a49 100644
--- a/helm-charts/common/chatqna-ui/Chart.yaml
+++ b/helm-charts/common/chatqna-ui/Chart.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-name: ui
+name: chatqna-ui
 description: A Helm chart to the UI for chatQnA workload
 type: application
 version: 0.8.0
diff --git a/helm-charts/update_manifests.sh b/helm-charts/update_manifests.sh
index 42ee9b5c6..2c1ad0743 100755
--- a/helm-charts/update_manifests.sh
+++ b/helm-charts/update_manifests.sh
@@ -7,6 +7,7 @@ CUR_DIR=$(cd $(dirname "$0") && pwd)
 OUTPUTDIR=${CUR_DIR}/../microservices-connector/config/manifests
 MODELPATH="/mnt/opea-models"
 
+NEWTAG="${NEWTAG:-latest}"
 #
 # generate_yaml <chart> <outputdir>
 #
@@ -16,7 +17,7 @@ function generate_yaml {
 
   local extraparams=""
   if [[ $(grep -c 'tag: ""' ./common/$chart/values.yaml) != 0 ]]; then
-     extraparams="--set image.tag=latest"
+     extraparams="--set image.tag=$NEWTAG"
   fi
 
   helm template $chart ./common/$chart --skip-tests --values ./common/$chart/values.yaml --set global.extraEnvConfig=extra-env-config,global.modelUseHostPath=$MODELPATH,noProbe=true $extraparams > ${outputdir}/$chart.yaml
@@ -25,7 +26,7 @@ function generate_yaml {
     ext=$(basename $f | cut -d'-' -f1)
     extraparams=""
     if [[ $(grep -c 'tag: ""' $f) != 0 ]]; then
-       extraparams="--set image.tag=latest"
+       extraparams="--set image.tag=$NEWTAG"
     fi
     helm template $chart ./common/$chart --skip-tests --values ${f} --set global.extraEnvConfig=extra-env-config,global.modelUseHostPath=$MODELPATH,noProbe=true $extraparams > ${outputdir}/${chart}_${ext}.yaml
   done
@@ -43,4 +44,4 @@ done
 
 # we need special version of docsum-llm-uservice
 echo "Update manifest for docsum-llm-uservice..."
-helm template docsum ./common/llm-uservice --skip-tests --set global.extraEnvConfig=extra-env-config,global.modelUseHostPath=$MODELPATH,noProbe=true,image.repository=opea/llm-docsum-tgi,image.tag=latest> ${OUTPUTDIR}/docsum-llm-uservice.yaml
+helm template docsum ./common/llm-uservice --skip-tests --set global.extraEnvConfig=extra-env-config,global.modelUseHostPath=$MODELPATH,noProbe=true,image.repository=opea/llm-docsum-tgi,image.tag=$NEWTAG> ${OUTPUTDIR}/docsum-llm-uservice.yaml
diff --git a/microservices-connector/config/manifests/chatqna-ui.yaml b/microservices-connector/config/manifests/chatqna-ui.yaml
index 01a5c854a..bf9fc3408 100644
--- a/microservices-connector/config/manifests/chatqna-ui.yaml
+++ b/microservices-connector/config/manifests/chatqna-ui.yaml
@@ -1,5 +1,5 @@
 ---
-# Source: ui/templates/configmap.yaml
+# Source: chatqna-ui/templates/configmap.yaml
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
@@ -8,8 +8,8 @@ kind: ConfigMap
 metadata:
   name: chatqna-ui-config
   labels:
-    helm.sh/chart: ui-0.8.0
-    app.kubernetes.io/name: ui
+    helm.sh/chart: chatqna-ui-0.8.0
+    app.kubernetes.io/name: chatqna-ui
     app.kubernetes.io/instance: chatqna-ui
     app.kubernetes.io/version: "v0.8"
     app.kubernetes.io/managed-by: Helm
@@ -17,15 +17,14 @@ data:
   http_proxy: ""
   https_proxy: ""
   no_proxy: ""
-  BACKEND_SERVICE_ENDPOINT: ""
-  DATAPREP_SERVICE_ENDPOINT: ""
-  DATAPREP_GET_FILE_ENDPOINT: ""
+  APP_BACKEND_SERVICE_ENDPOINT: ""
+  APP_DATA_PREP_SERVICE_URL: ""
   CHAT_BASE_URL: ""
   UPLOAD_FILE_BASE_URL: ""
   GET_FILE: ""
   DELETE_FILE: ""
 ---
-# Source: ui/templates/service.yaml
+# Source: chatqna-ui/templates/service.yaml
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
@@ -34,8 +33,8 @@ kind: Service
 metadata:
   name: chatqna-ui
   labels:
-    helm.sh/chart: ui-0.8.0
-    app.kubernetes.io/name: ui
+    helm.sh/chart: chatqna-ui-0.8.0
+    app.kubernetes.io/name: chatqna-ui
     app.kubernetes.io/instance: chatqna-ui
     app.kubernetes.io/version: "v0.8"
     app.kubernetes.io/managed-by: Helm
@@ -47,10 +46,10 @@ spec:
       protocol: TCP
       name: ui
   selector:
-    app.kubernetes.io/name: ui
+    app.kubernetes.io/name: chatqna-ui
     app.kubernetes.io/instance: chatqna-ui
 ---
-# Source: ui/templates/deployment.yaml
+# Source: chatqna-ui/templates/deployment.yaml
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
@@ -59,8 +58,8 @@ kind: Deployment
 metadata:
   name: chatqna-ui
   labels:
-    helm.sh/chart: ui-0.8.0
-    app.kubernetes.io/name: ui
+    helm.sh/chart: chatqna-ui-0.8.0
+    app.kubernetes.io/name: chatqna-ui
     app.kubernetes.io/instance: chatqna-ui
     app.kubernetes.io/version: "v0.8"
     app.kubernetes.io/managed-by: Helm
@@ -68,13 +67,13 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app.kubernetes.io/name: ui
+      app.kubernetes.io/name: chatqna-ui
       app.kubernetes.io/instance: chatqna-ui
   template:
     metadata:
       labels:
-        helm.sh/chart: ui-0.8.0
-        app.kubernetes.io/name: ui
+        helm.sh/chart: chatqna-ui-0.8.0
+        app.kubernetes.io/name: chatqna-ui
         app.kubernetes.io/instance: chatqna-ui
         app.kubernetes.io/version: "v0.8"
         app.kubernetes.io/managed-by: Helm
@@ -82,7 +81,7 @@ spec:
       securityContext:
         {}
       containers:
-        - name: ui
+        - name: chatqna-ui
           envFrom:
             - configMapRef:
                 name: chatqna-ui-config