diff --git a/.gitignore b/.gitignore
index 96d94bca..1a25cc1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@ arch_log/
 arch/tools/*.egg-info
 arch/tools/config
 arch/tools/build
-arch/stage.env
 model_server/model_server.egg-info
 model_server/venv_model_server
 model_server/build
@@ -32,3 +31,4 @@ arch_logs/
 dist/
 crates/*/target/
 crates/target/
+build.log
diff --git a/arch/docker-compose.e2e.yaml b/arch/docker-compose.e2e.yaml
new file mode 100644
index 00000000..ebff459e
--- /dev/null
+++ b/arch/docker-compose.e2e.yaml
@@ -0,0 +1,17 @@
+services:
+  archgw:
+    image: katanemo/archgw:latest
+    ports:
+      - "10000:10000"
+      - "11000:11000"
+      - "12000:12000"
+      - "19901:9901"
+    volumes:
+      - ${ARCH_CONFIG_FILE:-../demos/function_calling/arch_config.yaml}:/config/arch_config.yaml
+      - /etc/ssl/cert.pem:/etc/ssl/cert.pem
+      - ~/archgw_logs:/var/log/
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    environment:
+      - OPENAI_API_KEY=${OPENAI_API_KEY:?error}
+      - MISTRAL_API_KEY=${MISTRAL_API_KEY:?error}
diff --git a/arch/docker-compose.yaml b/arch/docker-compose.yaml
index ebff459e..773fa4e0 100644
--- a/arch/docker-compose.yaml
+++ b/arch/docker-compose.yaml
@@ -12,6 +12,5 @@ services:
       - ~/archgw_logs:/var/log/
     extra_hosts:
       - "host.docker.internal:host-gateway"
-    environment:
-      - OPENAI_API_KEY=${OPENAI_API_KEY:?error}
-      - MISTRAL_API_KEY=${MISTRAL_API_KEY:?error}
+    env_file:
+      - stage.env
diff --git a/e2e_tests/run_e2e_tests.sh b/e2e_tests/run_e2e_tests.sh
index 86e02d71..d6cd2fea 100644
--- a/e2e_tests/run_e2e_tests.sh
+++ b/e2e_tests/run_e2e_tests.sh
@@ -32,10 +32,10 @@ cd ../arch
 docker build  -f Dockerfile .. -t katanemo/archgw -q
 log starting the arch gateway service
 log =================================
-docker compose down
+docker compose -f docker-compose.e2e.yaml down
 log waiting for model service to be healthy
 wait_for_healthz "http://localhost:51000/healthz" 600 # wait for 10 mins
-docker compose up -d
+docker compose -f docker-compose.e2e.yaml up -d
 log waiting for arch gateway service to be healthy
 wait_for_healthz "http://localhost:10000/healthz" 60
 log waiting for arch gateway service to be healthy
@@ -49,7 +49,7 @@ poetry run pytest
 log shutting down the arch gateway service
 log ======================================
 cd ../arch
-docker compose stop 2>&1 >> ../build.log
+docker compose -f docker-compose.e2e.yaml stop 2>&1 >> ../build.log
 cd -
 
 log shutting down the function_calling demo