diff --git a/AudioQnA/tests/test_audioqna_on_gaudi.sh b/AudioQnA/tests/test_audioqna_on_gaudi.sh
index 4c0aa3d39..7493f8f8a 100644
--- a/AudioQnA/tests/test_audioqna_on_gaudi.sh
+++ b/AudioQnA/tests/test_audioqna_on_gaudi.sh
@@ -67,15 +67,15 @@ function start_services() {
 
     # Start Docker Containers
     docker compose up -d
-     n=0
-     until [[ "$n" -ge 500 ]]; 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
-         n=$((n+1))
-     done
+    n=0
+    until [[ "$n" -ge 500 ]]; 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
+       n=$((n+1))
+    done
 }
 
 
diff --git a/AudioQnA/tests/test_audioqna_on_xeon.sh b/AudioQnA/tests/test_audioqna_on_xeon.sh
index 6c42e3f7c..bb6340210 100644
--- a/AudioQnA/tests/test_audioqna_on_xeon.sh
+++ b/AudioQnA/tests/test_audioqna_on_xeon.sh
@@ -64,7 +64,7 @@ function start_services() {
     # Start Docker Containers
     docker compose up -d
     n=0
-    until [[ "$n" -ge 200 ]]; do
+    until [[ "$n" -ge 500 ]]; do
        docker logs tgi-service > $LOG_PATH/tgi_service_start.log
        if grep -q Connected $LOG_PATH/tgi_service_start.log; then
            break
@@ -81,6 +81,14 @@ function validate_megaservice() {
     if [[ $result == *"AAA"* ]]; then
         echo "Result correct."
     else
+        docker logs whisper-service > $LOG_PATH/whisper-service.log
+        docker logs asr-service > $LOG_PATH/asr-service.log
+        docker logs speecht5-service > $LOG_PATH/tts-service.log
+        docker logs tts-service > $LOG_PATH/tts-service.log
+        docker logs tgi-service > $LOG_PATH/tgi-service.log
+        docker logs llm-tgi-server > $LOG_PATH/llm-tgi-server.log
+        docker logs audioqna-xeon-backend-server > $LOG_PATH/audioqna-xeon-backend-server.log
+
         echo "Result wrong."
         exit 1
     fi
diff --git a/CodeGen/docker/gaudi/compose.yaml b/CodeGen/docker/gaudi/compose.yaml
index bdf430759..477fd7c9a 100644
--- a/CodeGen/docker/gaudi/compose.yaml
+++ b/CodeGen/docker/gaudi/compose.yaml
@@ -79,9 +79,6 @@ services:
       - codegen-gaudi-backend-server
     ports:
       - "5174:80"
-    build:
-      args:
-        - BACKEND_SERVICE_ENDPOINT=${BACKEND_SERVICE_ENDPOINT}
     ipc: host
     restart: always
 
diff --git a/CodeGen/docker/xeon/compose.yaml b/CodeGen/docker/xeon/compose.yaml
index eca9a66cd..935447d3d 100644
--- a/CodeGen/docker/xeon/compose.yaml
+++ b/CodeGen/docker/xeon/compose.yaml
@@ -73,9 +73,6 @@ services:
       - codegen-xeon-backend-server
     ports:
       - "5174:80"
-    build:
-      args:
-        - BACKEND_SERVICE_ENDPOINT=${BACKEND_SERVICE_ENDPOINT}
     ipc: host
     restart: always
 
diff --git a/DocSum/docker/gaudi/compose.yaml b/DocSum/docker/gaudi/compose.yaml
index 44da5cea2..e2f797ed8 100644
--- a/DocSum/docker/gaudi/compose.yaml
+++ b/DocSum/docker/gaudi/compose.yaml
@@ -76,9 +76,6 @@ services:
     container_name: docsum-gaudi-react-ui-server
     depends_on:
       - docsum-gaudi-backend-server
-    build:
-      args:
-        - BACKEND_SERVICE_ENDPOINT=${BACKEND_SERVICE_ENDPOINT}
     ports:
       - "5174:80"
     environment:
diff --git a/DocSum/docker/xeon/compose.yaml b/DocSum/docker/xeon/compose.yaml
index 2b6cdf03a..e8571c146 100644
--- a/DocSum/docker/xeon/compose.yaml
+++ b/DocSum/docker/xeon/compose.yaml
@@ -73,9 +73,6 @@ services:
     container_name: docsum-xeon-react-ui-server
     depends_on:
       - docsum-xeon-backend-server
-    build:
-      args:
-        - BACKEND_SERVICE_ENDPOINT=${BACKEND_SERVICE_ENDPOINT}
     ports:
       - "5174:80"
     ipc: host