diff --git a/helm-charts/common/whisper/Chart.yaml b/helm-charts/common/whisper/Chart.yaml
index c03ad7a0c..86087cb6e 100644
--- a/helm-charts/common/whisper/Chart.yaml
+++ b/helm-charts/common/whisper/Chart.yaml
@@ -8,3 +8,7 @@ type: application
 version: 0-latest
 # The whisper microservice server version
 appVersion: "v1.0"
+dependencies:
+  - name: commonlib
+    version: 0-latest
+    repository: "file://../commonlib"
diff --git a/helm-charts/common/whisper/templates/deployment.yaml b/helm-charts/common/whisper/templates/deployment.yaml
index f8dafbb27..bc78ccf2d 100644
--- a/helm-charts/common/whisper/templates/deployment.yaml
+++ b/helm-charts/common/whisper/templates/deployment.yaml
@@ -14,13 +14,11 @@ spec:
       {{- include "whisper.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- include "common.annotations" . | nindent 6 }}
       labels:
         {{- include "whisper.selectorLabels" . | nindent 8 }}
     spec:
+      {{- include "common.runtimeClassName" . | indent 6 }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
diff --git a/helm-charts/common/whisper/values.yaml b/helm-charts/common/whisper/values.yaml
index b1f3e247b..9f45f3089 100644
--- a/helm-charts/common/whisper/values.yaml
+++ b/helm-charts/common/whisper/values.yaml
@@ -83,6 +83,8 @@ tolerations: []
 
 affinity: {}
 
+tdxEnabled: false
+
 global:
   http_proxy: ""
   https_proxy: ""
diff --git a/helm-charts/docsum/Chart.yaml b/helm-charts/docsum/Chart.yaml
index 4d02035f8..288d7fba2 100644
--- a/helm-charts/docsum/Chart.yaml
+++ b/helm-charts/docsum/Chart.yaml
@@ -32,5 +32,8 @@ dependencies:
     version: 0-latest
     repository: "file://../common/nginx"
     condition: nginx.enabled
+  - name: commonlib
+    version: 0-latest
+    repository: "file://../common/commonlib"
 version: 0-latest
 appVersion: "v1.0"
diff --git a/helm-charts/docsum/README.md b/helm-charts/docsum/README.md
index 2864714ce..1c84fd9f6 100644
--- a/helm-charts/docsum/README.md
+++ b/helm-charts/docsum/README.md
@@ -20,6 +20,8 @@ helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --se
 # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --values docsum/gaudi-tgi-values.yaml ...
 # To use Gaudi device with vLLM
 # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --values docsum/gaudi-vllm-values.yaml ..
+# To run docsum with Intel TDX feature
+# helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --set tgi.LLM_MODEL_ID=${MODELNAME} --set tdxEnabled=true --set resources.limits.memory=1Gi --set docsum-ui.tdxEnabled=true --set docsum-ui.resources.limits.memory=2Gi --set llm-uservice.tdxEnabled=true --set llm-uservice.resources.limits.memory=4Gi --set tgi.tdxEnabled=true --set tgi.resources.limits.memory=80Gi --set whisper.tdxEnabled=true --set whisper.resources.limits.memory=13Gi
 ```
 
 ## Verify
diff --git a/helm-charts/docsum/templates/deployment.yaml b/helm-charts/docsum/templates/deployment.yaml
index 486820715..0e96f5f25 100644
--- a/helm-charts/docsum/templates/deployment.yaml
+++ b/helm-charts/docsum/templates/deployment.yaml
@@ -16,14 +16,12 @@ spec:
       app: {{ include "docsum.fullname" . }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- include "common.annotations" . | nindent 6 }}
       labels:
         {{- include "docsum.selectorLabels" . | nindent 8 }}
         app: {{ include "docsum.fullname" . }}
     spec:
+      {{- include "common.runtimeClassName" . | indent 6 }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
diff --git a/helm-charts/docsum/values.yaml b/helm-charts/docsum/values.yaml
index a122df98b..61f54921a 100644
--- a/helm-charts/docsum/values.yaml
+++ b/helm-charts/docsum/values.yaml
@@ -103,6 +103,8 @@ docsum-ui:
 dashboard:
   prefix: "OPEA DocSum"
 
+tdxEnabled: false
+
 global:
   http_proxy: ""
   https_proxy: ""