diff --git a/DocIndexRetriever/docker_image_build/README.md b/DocIndexRetriever/docker_compose/intel/README.md
similarity index 93%
rename from DocIndexRetriever/docker_image_build/README.md
rename to DocIndexRetriever/docker_compose/intel/README.md
index 9e32c3565..d2531001e 100644
--- a/DocIndexRetriever/docker_image_build/README.md
+++ b/DocIndexRetriever/docker_compose/intel/README.md
@@ -2,7 +2,7 @@
 
 DocRetriever are the most widely adopted use case for leveraging the different methodologies to match user query against a set of free-text records. DocRetriever is essential to RAG system, which bridges the knowledge gap by dynamically fetching relevant information from external sources, ensuring that responses generated remain factual and current. The core of this architecture are vector databases, which are instrumental in enabling efficient and semantic retrieval of information. These databases store data as vectors, allowing RAG to swiftly access the most pertinent documents or data points based on semantic similarity.
 
-## 1. Build Images for necessary microservices. (This step will not needed after docker image released)
+## 1. Build Images for necessary microservices. (Optional after docker image release)
 
 - Embedding TEI Image
 
@@ -35,7 +35,7 @@ DocRetriever are the most widely adopted use case for leveraging the different m
 ```bash
 cd ..
 git clone https://github.com/opea-project/GenAIExamples.git
-cd GenAIExamples/DocIndexRetriever/docker
+cd GenAIExamples/DocIndexRetriever
 docker build --no-cache -t opea/doc-index-retriever:latest --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -f ./Dockerfile .
 ```
 
@@ -58,12 +58,12 @@ export RERANK_SERVICE_HOST_IP=${host_ip}
 export LLM_SERVICE_HOST_IP=${host_ip}
 export BACKEND_SERVICE_ENDPOINT="http://${host_ip}:8000/v1/retrievaltool"
 export DATAPREP_SERVICE_ENDPOINT="http://${host_ip}:6007/v1/dataprep"
-export llm_hardware='xeon' #xeon, xpu, gaudi
-cd GenAIExamples/DocIndexRetriever/docker/${llm_hardware}/
-docker compose -f docker-compose.yaml up -d
+export llm_hardware='cpu/xeon' #cpu/xeon, xpu, hpu/gaudi
+cd GenAIExamples/DocIndexRetriever/intel/${llm_hardware}/
+docker compose -f compose.yaml up -d
 ```
 
-## 3. Validation
+## 4. Validation
 
 Add Knowledge Base via HTTP Links:
 
@@ -87,7 +87,7 @@ curl http://${host_ip}:8889/v1/retrievaltool -X POST -H "Content-Type: applicati
 {"id":"354e62c703caac8c547b3061433ec5e8","reranked_docs":[{"id":"06d5a5cefc06cf9a9e0b5fa74a9f233c","text":"Close SearchsearchMenu WikiNewsCommunity Daysx-twitter linkedin github searchStreamlining implementation of enterprise-grade Generative AIEfficiently integrate secure, performant, and cost-effective Generative AI workflows into business value.TODAYOPEA..."}],"initial_query":"Explain the OPEA project?"}
 ```
 
-## 4. Trouble shooting
+## 5. Trouble shooting
 
 1. check all containers are alive
 
diff --git a/DocIndexRetriever/docker_compose/intel/cpu/xeon/docker_compose.yaml b/DocIndexRetriever/docker_compose/intel/cpu/xeon/compose.yaml
similarity index 100%
rename from DocIndexRetriever/docker_compose/intel/cpu/xeon/docker_compose.yaml
rename to DocIndexRetriever/docker_compose/intel/cpu/xeon/compose.yaml
diff --git a/DocIndexRetriever/docker_compose/intel/hpu/gaudi/docker_compose.yaml b/DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml
similarity index 100%
rename from DocIndexRetriever/docker_compose/intel/hpu/gaudi/docker_compose.yaml
rename to DocIndexRetriever/docker_compose/intel/hpu/gaudi/compose.yaml
diff --git a/DocIndexRetriever/docker_image_build/build.yaml b/DocIndexRetriever/docker_image_build/build.yaml
index 6f603f61c..a28af33ed 100644
--- a/DocIndexRetriever/docker_image_build/build.yaml
+++ b/DocIndexRetriever/docker_image_build/build.yaml
@@ -13,24 +13,24 @@ services:
   embedding-tei:
     build:
       context: GenAIComps
-      dockerfile: comps/embeddings/langchain/docker/Dockerfile
+      dockerfile: comps/embeddings/tei/langchain/Dockerfile
     extends: doc-index-retriever
     image: ${REGISTRY:-opea}/embedding-tei:${TAG:-latest}
   retriever-redis:
     build:
       context: GenAIComps
-      dockerfile: comps/retrievers/langchain/redis/docker/Dockerfile
+      dockerfile: comps/retrievers/redis/langchain/Dockerfile
     extends: chatqna
     image: ${REGISTRY:-opea}/retriever-redis:${TAG:-latest}
   reranking-tei:
     build:
       context: GenAIComps
-      dockerfile: comps/reranks/tei/docker/Dockerfile
+      dockerfile: comps/reranks/tei/Dockerfile
     extends: doc-index-retriever
     image: ${REGISTRY:-opea}/reranking-tei:${TAG:-latest}
   dataprep-on-ray-redis:
     build:
       context: GenAIComps
-      dockerfile: comps/dataprep/redis/langchain_ray/docker/Dockerfile
+      dockerfile: comps/dataprep/redis/langchain_ray/Dockerfile
     extends: doc-index-retriever
     image: ${REGISTRY:-opea}/dataprep-on-ray-redis:${TAG:-latest}
diff --git a/VisualQnA/docker_image_build/build.yaml b/VisualQnA/docker_image_build/build.yaml
index 4988a06dc..037cf4c5a 100644
--- a/VisualQnA/docker_image_build/build.yaml
+++ b/VisualQnA/docker_image_build/build.yaml
@@ -26,6 +26,6 @@ services:
   nginx:
     build:
       context: GenAIComps
-      dockerfile: comps/nginx/docker/Dockerfile
+      dockerfile: comps/nginx/Dockerfile
     extends: visualqna
     image: ${REGISTRY:-opea}/nginx:${TAG:-latest}