diff --git a/arch/docker-compose.yaml b/arch/docker-compose.yaml
index 02752736..607a6a6d 100644
--- a/arch/docker-compose.yaml
+++ b/arch/docker-compose.yaml
@@ -12,3 +12,6 @@ services:
       - ~/archgw_logs:/var/log/
     env_file:
       - stage.env
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
diff --git a/arch/tools/cli/main.py b/arch/tools/cli/main.py
index 95c056e6..8c295042 100644
--- a/arch/tools/cli/main.py
+++ b/arch/tools/cli/main.py
@@ -62,6 +62,7 @@ def build(services):
                         "-t",
                         "archgw:latest",
                         ".",
+                        "--add-host=host.docker.internal:host-gateway",
                     ],
                     check=True,
                 )
diff --git a/demos/function_calling/docker-compose.yaml b/demos/function_calling/docker-compose.yaml
index 46e1b421..fec5b95b 100644
--- a/demos/function_calling/docker-compose.yaml
+++ b/demos/function_calling/docker-compose.yaml
@@ -18,6 +18,9 @@ services:
       - "18080:8080"
     environment:
       - CHAT_COMPLETION_ENDPOINT=http://host.docker.internal:10000/v1 #this is only because we are running the sample app in the same docker container environemtn as archgw
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
 
   opentelemetry:
     build:
diff --git a/demos/insurance_agent/docker-compose.yaml b/demos/insurance_agent/docker-compose.yaml
index 5a44b9a2..a898cda0 100644
--- a/demos/insurance_agent/docker-compose.yaml
+++ b/demos/insurance_agent/docker-compose.yaml
@@ -18,3 +18,6 @@ services:
       - "18080:8080"
     environment:
       - CHAT_COMPLETION_ENDPOINT=http://host.docker.internal:10000/v1
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+
diff --git a/demos/network_agent/docker-compose.yaml b/demos/network_agent/docker-compose.yaml
index 25e19420..a6a9311f 100644
--- a/demos/network_agent/docker-compose.yaml
+++ b/demos/network_agent/docker-compose.yaml
@@ -19,3 +19,6 @@ services:
     environment:
       - OPENAI_API_KEY=${OPENAI_API_KEY:?error}
       - CHAT_COMPLETION_ENDPOINT=http://host.docker.internal:10000/v1
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+