diff --git a/helm-charts/chatqna/gaudi-values.yaml b/helm-charts/chatqna/gaudi-values.yaml
index fae32ca2..a92e4867 100644
--- a/helm-charts/chatqna/gaudi-values.yaml
+++ b/helm-charts/chatqna/gaudi-values.yaml
@@ -52,7 +52,7 @@ tei:
   accelDevice: "gaudi"
   image:
     repository: ghcr.io/huggingface/tei-gaudi
-    tag: synapse_1.16
+    tag: 1.5.0
   resources:
     limits:
       habana.ai/gaudi: 1
diff --git a/helm-charts/chatqna/guardrails-gaudi-values.yaml b/helm-charts/chatqna/guardrails-gaudi-values.yaml
index 40d866a4..9e7cf091 100644
--- a/helm-charts/chatqna/guardrails-gaudi-values.yaml
+++ b/helm-charts/chatqna/guardrails-gaudi-values.yaml
@@ -16,7 +16,22 @@ tei:
   accelDevice: "gaudi"
   image:
     repository: ghcr.io/huggingface/tei-gaudi
-    tag: synapse_1.16
+    tag: 1.5.0
+  resources:
+    limits:
+      habana.ai/gaudi: 1
+  securityContext:
+    readOnlyRootFilesystem: false
+  livenessProbe:
+    timeoutSeconds: 1
+  readinessProbe:
+    timeoutSeconds: 1
+
+teirerank:
+  accelDevice: "gaudi"
+  image:
+    repository: opea/tei-gaudi
+    tag: "latest"
   resources:
     limits:
       habana.ai/gaudi: 1
diff --git a/helm-charts/common/tei/gaudi-values.yaml b/helm-charts/common/tei/gaudi-values.yaml
index c5141505..f97463bc 100644
--- a/helm-charts/common/tei/gaudi-values.yaml
+++ b/helm-charts/common/tei/gaudi-values.yaml
@@ -9,7 +9,7 @@ accelDevice: "gaudi"
 
 image:
   repository: ghcr.io/huggingface/tei-gaudi
-  tag: synapse_1.16
+  tag: 1.5.0
 
 securityContext:
   readOnlyRootFilesystem: false
diff --git a/microservices-connector/config/manifests/tei_gaudi.yaml b/microservices-connector/config/manifests/tei_gaudi.yaml
index a3529fe7..94cf5f4e 100644
--- a/microservices-connector/config/manifests/tei_gaudi.yaml
+++ b/microservices-connector/config/manifests/tei_gaudi.yaml
@@ -86,7 +86,7 @@ spec:
                 optional: true
           securityContext:
             {}
-          image: "ghcr.io/huggingface/tei-gaudi:synapse_1.16"
+          image: "ghcr.io/huggingface/tei-gaudi:1.5.0"
           imagePullPolicy: IfNotPresent
           args:
             - "--auto-truncate"
diff --git a/microservices-connector/config/samples/ChatQnA/use_cases.md b/microservices-connector/config/samples/ChatQnA/use_cases.md
index 85adbe61..4b793e24 100644
--- a/microservices-connector/config/samples/ChatQnA/use_cases.md
+++ b/microservices-connector/config/samples/ChatQnA/use_cases.md
@@ -25,7 +25,7 @@ The ChatQnA uses the below prebuilt images if you choose a Xeon deployment
 Should you desire to use the Gaudi accelerator, two alternate images are used for the embedding and llm services.
 For Gaudi:
 
-- tei-embedding-service: ghcr.io/huggingface/tei-gaudi:synapse_1.16
+- tei-embedding-service: ghcr.io/huggingface/tei-gaudi:1.5.0
 - tgi-service: ghcr.io/huggingface/tgi-gaudi:2.0.5
 
 ## Deploy ChatQnA pipeline