diff --git a/CodeGen/docker/docker_build_compose.yaml b/CodeGen/docker/docker_build_compose.yaml
index bc1db1194a..f68dfa8a53 100644
--- a/CodeGen/docker/docker_build_compose.yaml
+++ b/CodeGen/docker/docker_build_compose.yaml
@@ -27,4 +27,4 @@ services:
       context: GenAIComps
       dockerfile: comps/llms/text-generation/tgi/Dockerfile
     extends: codegen
-    image: ${REGISTRY}opea/llm-tgi:${TAG:-latest}
+    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
diff --git a/DocSum/tests/test_docsum_on_gaudi.sh b/DocSum/tests/test_docsum_on_gaudi.sh
index 0906bd906c..8cd1da774c 100644
--- a/DocSum/tests/test_docsum_on_gaudi.sh
+++ b/DocSum/tests/test_docsum_on_gaudi.sh
@@ -104,7 +104,7 @@ function validate_megaservice() {
     # Curl the Mega Service
     validate_services \
     "${ip_address}:8888/v1/docsum" \
-    "versatile toolkit" \
+    "toolkit" \
     "mega-docsum" \
     "docsum-gaudi-backend-server" \
     '{"messages": "Text Embeddings Inference (TEI) is a toolkit for deploying and serving open source text embeddings and sequence classification models. TEI enables high-performance extraction for the most popular models, including FlagEmbedding, Ember, GTE and E5."}'
diff --git a/DocSum/tests/test_docsum_on_xeon.sh b/DocSum/tests/test_docsum_on_xeon.sh
index e9bc7a8c00..22415f34f2 100644
--- a/DocSum/tests/test_docsum_on_xeon.sh
+++ b/DocSum/tests/test_docsum_on_xeon.sh
@@ -103,7 +103,7 @@ function validate_megaservice() {
     # Curl the Mega Service
     validate_services \
     "${ip_address}:8888/v1/docsum" \
-    "versatile toolkit" \
+    "toolkit" \
     "mega-docsum" \
     "docsum-xeon-backend-server" \
     '{"messages": "Text Embeddings Inference (TEI) is a toolkit for deploying and serving open source text embeddings and sequence classification models. TEI enables high-performance extraction for the most popular models, including FlagEmbedding, Ember, GTE and E5."}'
diff --git a/Translation/docker/docker_build_compose.yaml b/Translation/docker/docker_build_compose.yaml
index 5b2dea9ac3..05da618777 100644
--- a/Translation/docker/docker_build_compose.yaml
+++ b/Translation/docker/docker_build_compose.yaml
@@ -16,3 +16,9 @@ services:
       dockerfile: ./docker/Dockerfile
     extends: translation
     image: ${REGISTRY:-opea}/translation-ui:${TAG:-latest}
+  llm-tgi:
+    build:
+      context: GenAIComps
+      dockerfile: comps/llms/text-generation/tgi/Dockerfile
+    extends: translation
+    image: ${REGISTRY:-opea}/llm-tgi:${TAG:-latest}
diff --git a/Translation/tests/test_translation_on_gaudi.sh b/Translation/tests/test_translation_on_gaudi.sh
index 47aa96a259..8262c54f08 100644
--- a/Translation/tests/test_translation_on_gaudi.sh
+++ b/Translation/tests/test_translation_on_gaudi.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -x
+set -xe
 IMAGE_REPO=${IMAGE_REPO:-"opea"}
 IMAGE_TAG=${IMAGE_TAG:-"latest"}
 echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}"
@@ -42,12 +42,12 @@ function start_services() {
     docker compose up -d
 
     n=0
-    until [[ "$n" -ge 500 ]]; do
+    until [[ "$n" -ge 100 ]]; do
         docker logs tgi-gaudi-server > ${LOG_PATH}/tgi_service_start.log
         if grep -q Connected ${LOG_PATH}/tgi_service_start.log; then
             break
         fi
-        sleep 1s
+        sleep 5s
         n=$((n+1))
     done
 }
diff --git a/Translation/tests/test_translation_on_xeon.sh b/Translation/tests/test_translation_on_xeon.sh
index 2b67833d66..e0e61523cf 100644
--- a/Translation/tests/test_translation_on_xeon.sh
+++ b/Translation/tests/test_translation_on_xeon.sh
@@ -2,7 +2,7 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-set -x
+set -xe
 IMAGE_REPO=${IMAGE_REPO:-"opea"}
 IMAGE_TAG=${IMAGE_TAG:-"latest"}
 echo "REGISTRY=IMAGE_REPO=${IMAGE_REPO}"