diff --git a/arch/tools/cli/docker_cli.py b/arch/tools/cli/docker_cli.py
index 8cbf47a6..0cb058ad 100644
--- a/arch/tools/cli/docker_cli.py
+++ b/arch/tools/cli/docker_cli.py
@@ -52,7 +52,7 @@ def docker_start_archgw_detached(
     port_mappings = [
         f"{prompt_gateway_port}:{prompt_gateway_port}",
         f"{llm_gateway_port}:{llm_gateway_port}",
-        "9901:19901",
+        "19901:9901",
     ]
     port_mappings_args = [item for port in port_mappings for item in ("-p", port)]
 
diff --git a/crates/brightstaff/src/main.rs b/crates/brightstaff/src/main.rs
index 2c041648..fd14a88a 100644
--- a/crates/brightstaff/src/main.rs
+++ b/crates/brightstaff/src/main.rs
@@ -84,7 +84,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     info!("listening on http://{}", bind_address);
     let listener = TcpListener::bind(bind_address).await?;
 
-    let model = arch_config.routing.as_ref().unwrap().model.clone();
+    let model = arch_config
+        .routing
+        .as_ref()
+        .and_then(|r| Some(r.model.clone()))
+        .unwrap_or_else(|| "none".to_string());
 
     let router_service: Arc<RouterService> = Arc::new(RouterService::new(
         arch_config.llm_providers.clone(),