diff --git a/helm-charts/chatqna/faqgen-gaudi-tgi-values.yaml b/helm-charts/chatqna/faqgen-gaudi-tgi-values.yaml
index 88fca4ed5..99b7fb5c5 100644
--- a/helm-charts/chatqna/faqgen-gaudi-tgi-values.yaml
+++ b/helm-charts/chatqna/faqgen-gaudi-tgi-values.yaml
@@ -49,8 +49,8 @@ teirerank:
   OMPI_MCA_btl_vader_single_copy_mechanism: "none"
   MAX_WARMUP_SEQUENCE_LENGTH: "512"
   image:
-    repository: ghcr.io/huggingface/tei-gaudi
-    tag: 1.5.0
+    repository: ghcr.io/huggingface/text-embeddings-inference
+    tag: hpu-1.7
   resources:
     limits:
       habana.ai/gaudi: 1
diff --git a/helm-charts/chatqna/faqgen-gaudi-values.yaml b/helm-charts/chatqna/faqgen-gaudi-values.yaml
index 7dd455e11..6e34ab4b0 100644
--- a/helm-charts/chatqna/faqgen-gaudi-values.yaml
+++ b/helm-charts/chatqna/faqgen-gaudi-values.yaml
@@ -42,8 +42,8 @@ teirerank:
   OMPI_MCA_btl_vader_single_copy_mechanism: "none"
   MAX_WARMUP_SEQUENCE_LENGTH: "512"
   image:
-    repository: ghcr.io/huggingface/tei-gaudi
-    tag: 1.5.0
+    repository: ghcr.io/huggingface/text-embeddings-inference
+    tag: hpu-1.7
   resources:
     limits:
       habana.ai/gaudi: 1
diff --git a/helm-charts/chatqna/gaudi-tgi-values.yaml b/helm-charts/chatqna/gaudi-tgi-values.yaml
index 027fecb3f..c5fc0fa8f 100644
--- a/helm-charts/chatqna/gaudi-tgi-values.yaml
+++ b/helm-charts/chatqna/gaudi-tgi-values.yaml
@@ -43,8 +43,8 @@ teirerank:
   OMPI_MCA_btl_vader_single_copy_mechanism: "none"
   MAX_WARMUP_SEQUENCE_LENGTH: "512"
   image:
-    repository: ghcr.io/huggingface/tei-gaudi
-    tag: 1.5.0
+    repository: ghcr.io/huggingface/text-embeddings-inference
+    tag: hpu-1.7
   resources:
     limits:
       habana.ai/gaudi: 1
@@ -60,8 +60,8 @@ teirerank:
 #   OMPI_MCA_btl_vader_single_copy_mechanism: "none"
 #   MAX_WARMUP_SEQUENCE_LENGTH: "512"
 #   image:
-#     repository: ghcr.io/huggingface/tei-gaudi
-#     tag: 1.5.0
+#     repository: ghcr.io/huggingface/text-embeddings-inference
+#     tag: hpu-1.7
 #   resources:
 #     limits:
 #       habana.ai/gaudi: 1
diff --git a/helm-charts/chatqna/gaudi-values.yaml b/helm-charts/chatqna/gaudi-values.yaml
index 19471c0e4..36a1ee29d 100644
--- a/helm-charts/chatqna/gaudi-values.yaml
+++ b/helm-charts/chatqna/gaudi-values.yaml
@@ -37,8 +37,8 @@ teirerank:
   OMPI_MCA_btl_vader_single_copy_mechanism: "none"
   MAX_WARMUP_SEQUENCE_LENGTH: "512"
   image:
-    repository: ghcr.io/huggingface/tei-gaudi
-    tag: 1.5.0
+    repository: ghcr.io/huggingface/text-embeddings-inference
+    tag: hpu-1.7
   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 5c88e73d0..bc2faef9a 100644
--- a/helm-charts/chatqna/guardrails-gaudi-values.yaml
+++ b/helm-charts/chatqna/guardrails-gaudi-values.yaml
@@ -19,8 +19,8 @@ guardrails-usvc:
 # tei:
 #   accelDevice: "gaudi"
 #   image:
-#     repository: ghcr.io/huggingface/tei-gaudi
-#     tag: 1.5.0
+#     repository: ghcr.io/huggingface/text-embeddings-inference
+#     tag: hpu-1.7
 #   resources:
 #     limits:
 #       habana.ai/gaudi: 1
@@ -32,8 +32,8 @@ teirerank:
   OMPI_MCA_btl_vader_single_copy_mechanism: "none"
   MAX_WARMUP_SEQUENCE_LENGTH: "512"
   image:
-    repository: ghcr.io/huggingface/tei-gaudi
-    tag: "1.5.0"
+    repository: ghcr.io/huggingface/text-embeddings-inference
+    tag: hpu-1.7
   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 b6c04fc13..b5bfafc11 100644
--- a/helm-charts/common/tei/gaudi-values.yaml
+++ b/helm-charts/common/tei/gaudi-values.yaml
@@ -6,8 +6,8 @@ accelDevice: "gaudi"
 OMPI_MCA_btl_vader_single_copy_mechanism: "none"
 MAX_WARMUP_SEQUENCE_LENGTH: "512"
 image:
-  repository: ghcr.io/huggingface/tei-gaudi
-  tag: 1.5.0
+  repository: ghcr.io/huggingface/text-embeddings-inference
+  tag: hpu-1.7
 
 securityContext:
   readOnlyRootFilesystem: false
diff --git a/helm-charts/common/teirerank/gaudi-values.yaml b/helm-charts/common/teirerank/gaudi-values.yaml
index b6c04fc13..b5bfafc11 100644
--- a/helm-charts/common/teirerank/gaudi-values.yaml
+++ b/helm-charts/common/teirerank/gaudi-values.yaml
@@ -6,8 +6,8 @@ accelDevice: "gaudi"
 OMPI_MCA_btl_vader_single_copy_mechanism: "none"
 MAX_WARMUP_SEQUENCE_LENGTH: "512"
 image:
-  repository: ghcr.io/huggingface/tei-gaudi
-  tag: 1.5.0
+  repository: ghcr.io/huggingface/text-embeddings-inference
+  tag: hpu-1.7
 
 securityContext:
   readOnlyRootFilesystem: false
diff --git a/helm-charts/searchqna/gaudi-values.yaml b/helm-charts/searchqna/gaudi-values.yaml
index a1abc1a44..35a0dd9cd 100644
--- a/helm-charts/searchqna/gaudi-values.yaml
+++ b/helm-charts/searchqna/gaudi-values.yaml
@@ -31,8 +31,8 @@ tgi:
 tei:
   accelDevice: "gaudi"
   image:
-    repository: ghcr.io/huggingface/tei-gaudi
-    tag: "1.5.0"
+    repository: ghcr.io/huggingface/text-embeddings-inference
+    tag: "hpu-1.7"
   OMPI_MCA_btl_vader_single_copy_mechanism: none
   MAX_WARMUP_SEQUENCE_LENGTH: 512
   securityContext: