diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml
index 9da10c975..a0e9706cc 100644
--- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml
+++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml
@@ -3,6 +3,72 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: chatqna-nginx-config
+  labels:
+    helm.sh/chart: chatqna-nginx-0.8.0
+    app.kubernetes.io/name: chatqna-nginx
+    app.kubernetes.io/instance: chatqna-nginx
+    app.kubernetes.io/version: "v0.8"
+    app.kubernetes.io/managed-by: Helm
+data:
+  default.conf: |
+    server {
+        listen       80;
+        listen  [::]:80;
+
+        location /home {
+            root   /usr/share/nginx/html;
+            index  index.html index.htm;
+        }
+
+        location / {
+            proxy_pass http://chatqna-ui.default.svc.cluster.local:5173;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        location /v1/chatqna {
+            proxy_pass http://chatqna.default.svc.cluster.local:8888;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+         location /v1/dataprep {
+            proxy_pass http://chatqna-data-prep.default.svc.cluster.local:6007;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+         location /v1/dataprep/get_file {
+            proxy_pass http://chatqna-data-prep.default.svc.cluster.local:6007;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+         location /v1/dataprep/delete_file {
+            proxy_pass http://chatqna-data-prep.default.svc.cluster.local:6007;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
+---
+# Source: chatqna/charts/data-prep/templates/configmap.yaml
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -457,6 +523,31 @@ spec:
     app.kubernetes.io/name: chatqna
     app.kubernetes.io/instance: chatqna
 ---
+# Source: chatqna/templates/service.yaml
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: chatqna-ui
+  labels:
+    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
+spec:
+  type: ClusterIP
+  ports:
+    - port: 5173
+      targetPort: 5173
+      protocol: TCP
+      name: chatqna-ui
+  selector:
+    app.kubernetes.io/name: chatqna-ui
+    app.kubernetes.io/instance: chatqna-ui
+---
 # Source: chatqna/charts/data-prep/templates/deployment.yaml
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
@@ -923,6 +1014,49 @@ spec:
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: chatqna-ui
+  labels:
+    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
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: chatqna-ui
+      app.kubernetes.io/instance: chatqna-ui
+  template:
+    metadata:
+      annotations:
+        sidecar.istio.io/rewriteAppHTTPProbers: 'true'
+      labels:
+        app.kubernetes.io/name: chatqna-ui
+        app.kubernetes.io/instance: chatqna-ui
+    spec:
+      securityContext:
+        {}
+      hostIPC: true
+      containers:
+        - name: chatqna-ui
+          securityContext:
+            {}
+          image: "opea/chatqna-ui:latest"
+          imagePullPolicy: IfNotPresent
+          args: null
+          ports:
+            - name: http
+              containerPort: 5173
+              protocol: TCP
+---
+# Source: chatqna/charts/tei/templates/deployment.yaml
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -1239,3 +1373,60 @@ spec:
       volumes:
         - name: tmp
           emptyDir: {}
+---
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: chatqna-nginx-deployment
+  labels:
+    helm.sh/chart: chatqna-nginx-0.8.0
+    app.kubernetes.io/name: chatqna-nginx
+    app.kubernetes.io/instance: chatqna-nginx
+    app.kubernetes.io/version: "v0.8"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: chatqna-nginx
+  template:
+    metadata:
+      labels:
+        app: chatqna-nginx
+    spec:
+      containers:
+      - name: chatqna-nginx
+        image: nginx:latest
+        ports:
+        - containerPort: 80
+        volumeMounts:
+        - name: nginx-config-volume
+          mountPath: /etc/nginx/conf.d/default.conf
+          subPath: default.conf
+      volumes:
+      - name: nginx-config-volume
+        configMap:
+          name: chatqna-nginx-config
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: chatqna-nginx-svc
+  labels:
+    helm.sh/chart: chatqna-nginx-0.8.0
+    app.kubernetes.io/name: chatqna-nginx
+    app.kubernetes.io/instance: chatqna-nginx
+    app.kubernetes.io/version: "v0.8"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  selector:
+    app: chatqna-nginx
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+      nodePort: 30789
+  type: NodePort