diff --git a/README.md b/README.md
index c5762f52..ecafec04 100644
--- a/README.md
+++ b/README.md
@@ -38,9 +38,8 @@ Arch is engineered with purpose-built LLMs to handle critical but undifferentiat
 To get in touch with us, please join our [discord server](https://discord.gg/pGZf2gcwEc). We will be monitoring that actively and offering support there.
 
 ## Demos
-* [Weather Forecast](demos/weather_forecast/README.md) - Walk through of the core function calling capabilities of arch gateway using weather forecasting service
-* [Insurance Agent](demos/insurance_agent/README.md) - Build a full insurance agent with Arch
-* [Network Agent](demos/network_agent/README.md) - Build a networking co-pilot/agent agent with Arch
+* [Weather Forecast](demos/samples_python/weather_forecast/README.md) - Walk through of the core function calling capabilities of arch gateway using weather forecasting service
+* [Network Agent](demos/samples_python/network_switch_operator_agent/README.md) - Build a networking co-pilot/agent agent with Arch
 
 ## Quickstart
 
diff --git a/docs/source/build_with_arch/multi_turn.rst b/docs/source/build_with_arch/multi_turn.rst
index 3ff5e6da..3bb31002 100644
--- a/docs/source/build_with_arch/multi_turn.rst
+++ b/docs/source/build_with_arch/multi_turn.rst
@@ -80,7 +80,7 @@ Once the prompt targets are configured as above, handle parameters across multi-
 Demo App
 ~~~~~~~~
 
-For your convenience, we've built a `demo app <https://github.com/katanemo/archgw/main/demos/multi_turn_rag_agent>`_
+For your convenience, we've built a `demo app <https://github.com/katanemo/archgw/tree/main/demos/samples_python/multi_turn_rag_agent>`_
 that you can test and modify locally for multi-turn RAG scenarios.
 
 .. figure:: includes/multi_turn/mutli-turn-example.png
diff --git a/tests/e2e/run_e2e_tests.sh b/tests/e2e/run_e2e_tests.sh
index e288e30b..28594c52 100644
--- a/tests/e2e/run_e2e_tests.sh
+++ b/tests/e2e/run_e2e_tests.sh
@@ -26,7 +26,7 @@ log starting > ../build.log
 
 log building and running function_callling demo
 log ===========================================
-cd ../../demos/weather_forecast/
+cd ../../demos/samples_python/weather_forecast/
 docker compose up weather_forecast_service --build -d
 cd -
 
@@ -53,7 +53,7 @@ cd ../../
 tail -F ~/archgw_logs/modelserver.log &
 model_server_tail_pid=$!
 archgw down
-archgw up demos/weather_forecast/arch_config.yaml
+archgw up demos/samples_python/weather_forecast/arch_config.yaml
 kill $model_server_tail_pid
 cd -