diff --git a/WorkflowExecAgent/docker_compose/intel/cpu/xeon/compose_vllm.yaml b/WorkflowExecAgent/docker_compose/intel/cpu/xeon/compose_vllm.yaml
index 4304831f2..e69e9ef7f 100644
--- a/WorkflowExecAgent/docker_compose/intel/cpu/xeon/compose_vllm.yaml
+++ b/WorkflowExecAgent/docker_compose/intel/cpu/xeon/compose_vllm.yaml
@@ -3,10 +3,10 @@
 
 services:
   worflowexec-agent:
-    image: ${REGISTRY:-opea}/agent-langchain:${TAG:-latest}
+    image: ${REGISTRY:-opea}/agent:${TAG:-latest}
     container_name: workflowexec-agent-endpoint
     volumes:
-      - ${WORKDIR}/GenAIComps/comps/agent/langchain/:/home/user/comps/agent/langchain/
+      - ${WORKDIR}/GenAIComps/comps/agent/src/:/home/user/comps/agent/src/
       - ${TOOLSET_PATH}:/home/user/tools/
     ports:
       - "9090:9090"
diff --git a/WorkflowExecAgent/docker_image_build/build.yaml b/WorkflowExecAgent/docker_image_build/build.yaml
index e2a778b9a..61f2b0dda 100644
--- a/WorkflowExecAgent/docker_image_build/build.yaml
+++ b/WorkflowExecAgent/docker_image_build/build.yaml
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 services:
-  agent-langchain:
+  agent:
     build:
       context: GenAIComps
-      dockerfile: comps/agent/langchain/Dockerfile
+      dockerfile: comps/agent/src/Dockerfile
       args:
         http_proxy: ${http_proxy}
         https_proxy: ${https_proxy}
         no_proxy: ${no_proxy}
-    image: ${REGISTRY:-opea}/agent-langchain:${TAG:-latest}
+    image: ${REGISTRY:-opea}/agent:${TAG:-latest}