diff --git a/deployments/ai.coder.com/coder/realworld/main.tf b/deployments/ai.coder.com/coder/realworld/main.tf
index cbdcdf9..8d0b2b8 100644
--- a/deployments/ai.coder.com/coder/realworld/main.tf
+++ b/deployments/ai.coder.com/coder/realworld/main.tf
@@ -112,7 +112,7 @@ locals {
           "claude-haiku-4-5",
           "claude-sonnet-4-5",
         ],
-        "baseUrl" : "${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic",
+        "baseUrl" : "${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock",
         "apiKey" : "${data.coder_workspace_owner.me.session_token}"
       }
     }
diff --git a/deployments/ai.coder.com/demo/claude-runner-java21/main.tf b/deployments/ai.coder.com/demo/claude-runner-java21/main.tf
index d009fa1..53e9f36 100644
--- a/deployments/ai.coder.com/demo/claude-runner-java21/main.tf
+++ b/deployments/ai.coder.com/demo/claude-runner-java21/main.tf
@@ -436,7 +436,7 @@ locals {
       ANTHROPIC_MODEL                          = "claude-opus-4-5"
       ANTHROPIC_SMALL_FAST_MODEL               = "claude-haiku-4-5"
       ANTHROPIC_DEFAULT_HAIKU_MODEL            = "claude-haiku-4-5"
-      ANTHROPIC_BASE_URL                       = "${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic"
+      ANTHROPIC_BASE_URL                       = "${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock"
       ANTHROPIC_AUTH_TOKEN                     = "${data.coder_workspace_owner.me.session_token}"
       NODE_OPTIONS                             = "--max-old-space-size=8192"
       JAVA_HOME                                = "/usr/lib/jvm/temurin-21-jdk-amd64"
diff --git a/deployments/ai.coder.com/demo/claude-runner/main.tf b/deployments/ai.coder.com/demo/claude-runner/main.tf
index 11cbd26..36a167d 100644
--- a/deployments/ai.coder.com/demo/claude-runner/main.tf
+++ b/deployments/ai.coder.com/demo/claude-runner/main.tf
@@ -436,7 +436,7 @@ locals {
       ANTHROPIC_MODEL                          = "claude-opus-4-5"
       ANTHROPIC_SMALL_FAST_MODEL               = "claude-haiku-4-5"
       ANTHROPIC_DEFAULT_HAIKU_MODEL            = "claude-haiku-4-5"
-      ANTHROPIC_BASE_URL                       = "${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic"
+      ANTHROPIC_BASE_URL                       = "${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock"
       ANTHROPIC_AUTH_TOKEN                     = "${data.coder_workspace_owner.me.session_token}"
       # CLAUDE_API_KEY                           = "${data.coder_workspace_owner.me.session_token}"
       NODE_OPTIONS      = "--max-old-space-size=8192"
diff --git a/deployments/ai.coder.com/demo/datasci/main.tf b/deployments/ai.coder.com/demo/datasci/main.tf
index 2fcb7ab..a6323db 100644
--- a/deployments/ai.coder.com/demo/datasci/main.tf
+++ b/deployments/ai.coder.com/demo/datasci/main.tf
@@ -78,7 +78,7 @@ locals {
           "claude-haiku-4-5",
           "claude-sonnet-4-5"
         ],
-        "baseUrl" : "${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic",
+        "baseUrl" : "${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock",
         "apiKey" : "${data.coder_workspace_owner.me.session_token}"
       }
     }
@@ -244,7 +244,7 @@ locals {
       CLAUDE_CODE_ENABLE_TELEMETRY           = "1",
       CLAUDE_CODE_MAX_OUTPUT_TOKENS          = "8192",
       CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS = "1"
-      ANTHROPIC_BASE_URL                     = "${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic"
+      ANTHROPIC_BASE_URL                     = "${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock"
       ANTHROPIC_MODEL                        = "claude-opus-4-5"
       ANTHROPIC_SMALL_FAST_MODEL             = "claude-haiku-4-5"
     }
@@ -276,7 +276,7 @@ module "claude-code" {
 
       set +a
 
-      ANTHROPIC_BASE_URL="${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic"
+      ANTHROPIC_BASE_URL="${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock"
       ANTHROPIC_MODEL="claude-opus-4-6"
       ANTHROPIC_SMALL_FAST_MODEL="claude-haiku-4-5"
   EOF
diff --git a/deployments/ai.coder.com/demo/devbox/main.tf b/deployments/ai.coder.com/demo/devbox/main.tf
index 6eca5dd..feb12fa 100644
--- a/deployments/ai.coder.com/demo/devbox/main.tf
+++ b/deployments/ai.coder.com/demo/devbox/main.tf
@@ -78,7 +78,7 @@ locals {
           "claude-haiku-4-5",
           "claude-sonnet-4-5"
         ],
-        "baseUrl" : "${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic",
+        "baseUrl" : "${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock",
         "apiKey" : "${data.coder_workspace_owner.me.session_token}"
       }
     }
@@ -144,14 +144,6 @@ module "vscode-desktop" {
   group    = "Desktop IDEs"
 }
 
-module "rstudio-server" {
-  count        = data.coder_workspace.me.start_count
-  source       = "registry.coder.com/coder/rstudio-server/coder"
-  version      = "0.9.1"
-  project_path = local.work_folder
-  agent_id     = coder_agent.k8s-deployment.id
-}
-
 module "filebrowser" {
   count    = data.coder_workspace.me.start_count
   source   = "registry.coder.com/coder/filebrowser/coder"
@@ -252,7 +244,7 @@ locals {
       CLAUDE_CODE_ENABLE_TELEMETRY           = "1",
       CLAUDE_CODE_MAX_OUTPUT_TOKENS          = "8192",
       CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS = "1"
-      ANTHROPIC_BASE_URL                     = "${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic"
+      ANTHROPIC_BASE_URL                     = "${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock"
       ANTHROPIC_MODEL                        = "claude-opus-4-5"
       ANTHROPIC_SMALL_FAST_MODEL             = "claude-haiku-4-5"
     }
@@ -288,7 +280,7 @@ module "claude-code" {
 
       set +a
 
-      ANTHROPIC_BASE_URL="${data.coder_workspace.me.access_url}/api/v2/aibridge/anthropic"
+      ANTHROPIC_BASE_URL="${data.coder_workspace.me.access_url}/api/v2/aibridge/aws-bedrock"
       ANTHROPIC_MODEL="claude-opus-4-6"
       ANTHROPIC_SMALL_FAST_MODEL="claude-haiku-4-5"
   EOF