diff --git a/demos/advanced/currency_exchange/run_demo.sh b/demos/advanced/currency_exchange/run_demo.sh
index 6623dee5..cf6d06a9 100644
--- a/demos/advanced/currency_exchange/run_demo.sh
+++ b/demos/advanced/currency_exchange/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with config.yaml..."
-  planoai up config.yaml
+  planoai up --docker config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/advanced/model_choice_test_harness/run_demo.sh b/demos/advanced/model_choice_test_harness/run_demo.sh
index 5c0c875f..f1dbd08f 100644
--- a/demos/advanced/model_choice_test_harness/run_demo.sh
+++ b/demos/advanced/model_choice_test_harness/run_demo.sh
@@ -19,7 +19,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with arch_config_with_aliases.yaml..."
-  planoai up arch_config_with_aliases.yaml
+  planoai up --docker arch_config_with_aliases.yaml
 
   echo "\n\nPlano started successfully."
   echo "Please run the following command to test the setup: python bench.py\n"
@@ -29,7 +29,7 @@ start_demo() {
 stop_demo() {
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/advanced/multi_turn_rag/run_demo.sh b/demos/advanced/multi_turn_rag/run_demo.sh
index f9434aa2..3dfc23b7 100644
--- a/demos/advanced/multi_turn_rag/run_demo.sh
+++ b/demos/advanced/multi_turn_rag/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with config.yaml..."
-  planoai up config.yaml
+  planoai up --docker config.yaml
 
   # Step 4: Start Network Agent
   echo "Starting HR Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/advanced/stock_quote/run_demo.sh b/demos/advanced/stock_quote/run_demo.sh
index 6623dee5..cf6d06a9 100644
--- a/demos/advanced/stock_quote/run_demo.sh
+++ b/demos/advanced/stock_quote/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with config.yaml..."
-  planoai up config.yaml
+  planoai up --docker config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/getting_started/llm_gateway/run_demo.sh b/demos/getting_started/llm_gateway/run_demo.sh
index b049bf31..fbf3de1d 100644
--- a/demos/getting_started/llm_gateway/run_demo.sh
+++ b/demos/getting_started/llm_gateway/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with config.yaml..."
-  planoai up config.yaml
+  planoai up --docker config.yaml
 
   # Step 4: Start LLM Routing
   echo "Starting LLM Routing using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/getting_started/weather_forecast/run_demo.sh b/demos/getting_started/weather_forecast/run_demo.sh
index c8eb96e5..c4b7e3b3 100644
--- a/demos/getting_started/weather_forecast/run_demo.sh
+++ b/demos/getting_started/weather_forecast/run_demo.sh
@@ -74,7 +74,7 @@ start_demo() {
 
   # Step 4: Start Plano
   echo "Starting Plano with config.yaml..."
-  planoai up config.yaml
+  planoai up --docker config.yaml
 
   # Step 5: Start Network Agent with the chosen Docker Compose file
   echo "Starting Network Agent with $COMPOSE_FILE..."
@@ -93,7 +93,7 @@ stop_demo() {
 
   # Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/integrations/ollama/run_demo.sh b/demos/integrations/ollama/run_demo.sh
index 6623dee5..cf6d06a9 100644
--- a/demos/integrations/ollama/run_demo.sh
+++ b/demos/integrations/ollama/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with config.yaml..."
-  planoai up config.yaml
+  planoai up --docker config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/integrations/spotify_bearer_auth/run_demo.sh b/demos/integrations/spotify_bearer_auth/run_demo.sh
index 6623dee5..cf6d06a9 100644
--- a/demos/integrations/spotify_bearer_auth/run_demo.sh
+++ b/demos/integrations/spotify_bearer_auth/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with config.yaml..."
-  planoai up config.yaml
+  planoai up --docker config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/llm_routing/model_alias_routing/run_demo.sh b/demos/llm_routing/model_alias_routing/run_demo.sh
index 3528ee7a..2f9b186c 100644
--- a/demos/llm_routing/model_alias_routing/run_demo.sh
+++ b/demos/llm_routing/model_alias_routing/run_demo.sh
@@ -26,7 +26,7 @@ start_demo() {
 
   # Step 3: Start Plano
   echo "Starting Plano with arch_config_with_aliases.yaml..."
-  planoai up arch_config_with_aliases.yaml
+  planoai up --docker arch_config_with_aliases.yaml
 
   echo "\n\nPlano started successfully."
   echo "Please run the following CURL command to test model alias routing. Additional instructions are in the README.md file. \n"
@@ -48,7 +48,7 @@ start_demo() {
 stop_demo() {
   # Step 2: Stop Plano
   echo "Stopping Plano..."
-  planoai down
+  planoai down --docker
 }
 
 # Main script logic
diff --git a/demos/shared/test_runner/run_demo_tests.sh b/demos/shared/test_runner/run_demo_tests.sh
index 7feeb9ac..0c098106 100644
--- a/demos/shared/test_runner/run_demo_tests.sh
+++ b/demos/shared/test_runner/run_demo_tests.sh
@@ -21,7 +21,7 @@ do
   echo "****************************************"
   cd ../../$demo
   echo "starting plano"
-  planoai up config.yaml
+  planoai up --docker config.yaml
   echo "starting docker containers"
   # only execute docker compose if demo is llm_routing/preference_based_routing
   if [ "$demo" == "llm_routing/preference_based_routing" ]; then
@@ -38,7 +38,7 @@ do
     exit 1
   fi
   echo "stopping docker containers and plano"
-  planoai down
+  planoai down --docker
   docker compose down -v
   cd ../../shared/test_runner
 done
diff --git a/tests/e2e/run_e2e_tests.sh b/tests/e2e/run_e2e_tests.sh
index 80535368..c24931f4 100644
--- a/tests/e2e/run_e2e_tests.sh
+++ b/tests/e2e/run_e2e_tests.sh
@@ -45,8 +45,8 @@ uv sync
 
 log startup plano gateway with function calling demo
 cd ../../
-planoai down
-planoai up demos/getting_started/weather_forecast/config.yaml
+planoai down --docker
+planoai up --docker demos/getting_started/weather_forecast/config.yaml
 cd -
 
 log running e2e tests for prompt gateway
@@ -55,11 +55,11 @@ uv run pytest test_prompt_gateway.py
 
 log shutting down the plano gateway service for prompt_gateway demo
 log ===============================================================
-planoai down
+planoai down --docker
 
 log startup plano gateway with model alias routing demo
 cd ../../
-planoai up demos/llm_routing/model_alias_routing/config_with_aliases.yaml
+planoai up --docker demos/llm_routing/model_alias_routing/config_with_aliases.yaml
 cd -
 
 log running e2e tests for model alias routing
@@ -71,8 +71,8 @@ log ========================================
 uv run pytest test_openai_responses_api_client.py
 
 log startup plano gateway with state storage for openai responses api client demo
-planoai down
-planoai up config_memory_state_v1_responses.yaml
+planoai down --docker
+planoai up --docker config_memory_state_v1_responses.yaml
 
 log running e2e tests for openai responses api client
 log ========================================
diff --git a/tests/e2e/run_model_alias_tests.sh b/tests/e2e/run_model_alias_tests.sh
index 4c2aa7ee..49a2de13 100755
--- a/tests/e2e/run_model_alias_tests.sh
+++ b/tests/e2e/run_model_alias_tests.sh
@@ -36,8 +36,8 @@ uv sync
 # Start gateway with model alias routing config
 log "startup plano gateway with model alias routing demo"
 cd ../../
-planoai down || true
-planoai up demos/llm_routing/model_alias_routing/config_with_aliases.yaml
+planoai down --docker || true
+planoai up --docker demos/llm_routing/model_alias_routing/config_with_aliases.yaml
 cd -
 
 # Run both test suites that share this config in a single pytest invocation
@@ -46,4 +46,4 @@ uv run pytest -n auto test_model_alias_routing.py test_openai_responses_api_clie
 
 # Cleanup
 log "shutting down"
-planoai down || true
+planoai down --docker || true
diff --git a/tests/e2e/run_prompt_gateway_tests.sh b/tests/e2e/run_prompt_gateway_tests.sh
index bb9cdd43..58d850d8 100755
--- a/tests/e2e/run_prompt_gateway_tests.sh
+++ b/tests/e2e/run_prompt_gateway_tests.sh
@@ -41,8 +41,8 @@ cd -
 # Start gateway with prompt_gateway config
 log "startup plano gateway with function calling demo"
 cd ../../
-planoai down || true
-planoai up demos/getting_started/weather_forecast/config.yaml
+planoai down --docker || true
+planoai up --docker demos/getting_started/weather_forecast/config.yaml
 cd -
 
 # Run tests
@@ -51,7 +51,7 @@ uv run pytest test_prompt_gateway.py
 
 # Cleanup
 log "shutting down"
-planoai down || true
+planoai down --docker || true
 cd ../../demos/getting_started/weather_forecast
 docker compose down
 cd -
diff --git a/tests/e2e/run_responses_state_tests.sh b/tests/e2e/run_responses_state_tests.sh
index 3c974402..d503680c 100755
--- a/tests/e2e/run_responses_state_tests.sh
+++ b/tests/e2e/run_responses_state_tests.sh
@@ -35,8 +35,8 @@ uv sync
 # Start gateway with state storage config
 log "startup plano gateway with state storage config"
 cd ../../
-planoai down || true
-planoai up tests/e2e/config_memory_state_v1_responses.yaml
+planoai down --docker || true
+planoai up --docker tests/e2e/config_memory_state_v1_responses.yaml
 cd -
 
 # Run tests
@@ -45,4 +45,4 @@ uv run pytest test_openai_responses_api_client_with_state.py
 
 # Cleanup
 log "shutting down"
-planoai down || true
+planoai down --docker || true