diff --git a/ChatQnA/docker/xeon/compose_qdrant.yaml b/ChatQnA/docker/xeon/compose_qdrant.yaml
index e3ed77f4e4..d3573d248b 100644
--- a/ChatQnA/docker/xeon/compose_qdrant.yaml
+++ b/ChatQnA/docker/xeon/compose_qdrant.yaml
@@ -189,19 +189,6 @@ services:
       - DELETE_FILE=${DATAPREP_DELETE_FILE_ENDPOINT}
     ipc: host
     restart: always
-  chaqna-xeon-conversation-ui-server:
-    image: opea/chatqna-conversation-ui:latest
-    container_name: chatqna-xeon-conversation-ui-server
-    environment:
-      - no_proxy=${no_proxy}
-      - https_proxy=${https_proxy}
-      - http_proxy=${http_proxy}
-    ports:
-        - 5174:80
-    depends_on:
-        - chaqna-xeon-backend-server
-    ipc: host
-    restart: always
 
 networks:
   default:
diff --git a/ChatQnA/tests/test_chatqna_guardrails_on_gaudi.sh b/ChatQnA/tests/_test_chatqna_guardrails_on_gaudi.sh
similarity index 100%
rename from ChatQnA/tests/test_chatqna_guardrails_on_gaudi.sh
rename to ChatQnA/tests/_test_chatqna_guardrails_on_gaudi.sh
diff --git a/ChatQnA/tests/test_chatqna_qdrant_on_xeon.sh b/ChatQnA/tests/_test_chatqna_qdrant_on_xeon.sh
similarity index 97%
rename from ChatQnA/tests/test_chatqna_qdrant_on_xeon.sh
rename to ChatQnA/tests/_test_chatqna_qdrant_on_xeon.sh
index 931f5be7a7..f2d0f0e37d 100644
--- a/ChatQnA/tests/test_chatqna_qdrant_on_xeon.sh
+++ b/ChatQnA/tests/_test_chatqna_qdrant_on_xeon.sh
@@ -55,10 +55,11 @@ function start_services() {
     if [[ "$IMAGE_REPO" != "" ]]; then
         # Replace the container name with a test-specific name
         echo "using image repository $IMAGE_REPO and image tag $IMAGE_TAG"
-        sed -i "s#image: opea/chatqna:latest#image: opea/chatqna:${IMAGE_TAG}#g" compose.yaml
-        sed -i "s#image: opea/chatqna-ui:latest#image: opea/chatqna-ui:${IMAGE_TAG}#g" compose.yaml
-        sed -i "s#image: opea/chatqna-conversation-ui:latest#image: opea/chatqna-conversation-ui:${IMAGE_TAG}#g" compose.yaml
-        sed -i "s#image: opea/*#image: ${IMAGE_REPO}opea/#g" compose.yaml
+        sed -i "s#image: opea/chatqna:latest#image: opea/chatqna:${IMAGE_TAG}#g" compose_qdrant.yaml
+        sed -i "s#image: opea/chatqna-ui:latest#image: opea/chatqna-ui:${IMAGE_TAG}#g" compose_qdrant.yaml
+        sed -i "s#image: opea/chatqna-conversation-ui:latest#image: opea/chatqna-conversation-ui:${IMAGE_TAG}#g" compose_qdrant.yaml
+        sed -i "s#image: opea/*#image: ${IMAGE_REPO}opea/#g" compose_qdrant.yaml
+        cat compose_qdrant.yaml
     fi
 
     # Start Docker Containers
diff --git a/ChatQnA/tests/test_chatqna_vllm_on_gaudi.sh b/ChatQnA/tests/_test_chatqna_vllm_on_gaudi.sh
similarity index 100%
rename from ChatQnA/tests/test_chatqna_vllm_on_gaudi.sh
rename to ChatQnA/tests/_test_chatqna_vllm_on_gaudi.sh
diff --git a/ChatQnA/tests/test_chatqna_vllm_on_xeon.sh b/ChatQnA/tests/_test_chatqna_vllm_on_xeon.sh
similarity index 100%
rename from ChatQnA/tests/test_chatqna_vllm_on_xeon.sh
rename to ChatQnA/tests/_test_chatqna_vllm_on_xeon.sh
diff --git a/ChatQnA/tests/test_chatqna_vllm_ray_on_gaudi.sh b/ChatQnA/tests/_test_chatqna_vllm_ray_on_gaudi.sh
similarity index 100%
rename from ChatQnA/tests/test_chatqna_vllm_ray_on_gaudi.sh
rename to ChatQnA/tests/_test_chatqna_vllm_ray_on_gaudi.sh