diff --git a/docs/docs/configure/bedrock-custom-endpoints.md b/docs/docs/configure/bedrock-custom-endpoints.md
new file mode 100644
index 000000000..85fffb892
--- /dev/null
+++ b/docs/docs/configure/bedrock-custom-endpoints.md
@@ -0,0 +1,189 @@
+# Amazon Bedrock Custom Endpoints
+
+This guide covers using Altimate Code with a custom Amazon Bedrock endpoint — such as a corporate API gateway, reverse proxy, or VPC endpoint that sits in front of Bedrock.
+
+## When to use this
+
+Use this setup when your organization:
+
+- Routes Bedrock traffic through a centralized API gateway
+- Requires a custom domain or proxy for compliance / network policy
+- Uses a bearer token instead of standard AWS IAM credentials
+
+## Prerequisites
+
+You need one of the following:
+
+- A **bearer token** issued by your gateway (most common for custom endpoints)
+- Standard **AWS credentials** (access key, SSO profile, IAM role) if your gateway still delegates to the AWS credential chain
+
+## Step 1: Set up authentication
+
+=== "Bearer Token"
+
+    Export the token as an environment variable. Add this to your shell profile (`~/.zshrc`, `~/.bashrc`, or equivalent):
+
+    ```bash
+    export AWS_BEARER_TOKEN_BEDROCK="your-bearer-token-here"
+    ```
+
+    Then reload your shell:
+
+    ```bash
+    source ~/.zshrc
+    ```
+
+    !!! tip
+        If your organization uses the Altimate Code TUI, you can store the token via `altimate-code auth login --provider amazon-bedrock` instead of exporting it in your shell profile.
+
+=== "AWS Credential Chain"
+
+    If your gateway forwards standard AWS credentials, no extra auth setup is needed. Altimate Code uses the standard AWS credential chain:
+
+    1. `AWS_ACCESS_KEY_ID` / `AWS_SECRET_ACCESS_KEY` environment variables
+    2. `AWS_PROFILE` (named profile from `~/.aws/config`)
+    3. IAM role / SSO session
+    4. Web identity token (`AWS_WEB_IDENTITY_TOKEN_FILE`)
+    5. ECS / EKS container credentials
+
+    To use a specific AWS profile, set it in the config:
+
+    ```json
+    {
+      "provider": {
+        "amazon-bedrock": {
+          "options": {
+            "profile": "my-sso-profile"
+          }
+        }
+      }
+    }
+    ```
+
+!!! note
+    When a bearer token is present, the AWS credential chain is bypassed entirely. The bearer token always takes precedence.
+
+## Step 2: Create the config
+
+Create or edit `~/.config/altimate-code/altimate-code.json`:
+
+```json
+{
+  "model": "amazon-bedrock/anthropic.claude-sonnet-4-6-v1",
+  "provider": {
+    "amazon-bedrock": {
+      "options": {
+        "baseURL": "https://your-gateway.example.com/bedrock/v1",
+        "region": "us-east-1"
+      }
+    }
+  }
+}
+```
+
+| Field | Description |
+|-------|-------------|
+| `model` | The model to use, prefixed with `amazon-bedrock/`. |
+| `baseURL` | Your custom gateway URL. Replace with your organization's endpoint. |
+| `region` | The AWS region your gateway targets (e.g., `us-east-1`, `eu-west-1`). |
+
+!!! info "The `baseURL` path"
+    The path portion of the `baseURL` (e.g., `/bedrock/v1`) depends entirely on how your API gateway is configured. Ask your platform team for the correct URL — there is no universal standard path.
+
+### Config scope
+
+| Config location | Scope |
+|-----------------|-------|
+| `~/.config/altimate-code/altimate-code.json` | Global — applies to all projects |
+| `altimate-code.json` in a project root | Project — overrides global config for that project |
+
+## Step 3: Launch
+
+```bash
+altimate-code
+```
+
+The status bar should display your selected model under Amazon Bedrock.
+
+## Cross-region model ID prefixing
+
+Altimate Code may prepend a region prefix to model IDs for cross-region inference when the selected model and region require it. For example, with `region: "us-east-1"` the model ID `anthropic.claude-sonnet-4-6-v1` is sent to the gateway as `us.anthropic.claude-sonnet-4-6-v1`.
+
+Prefixing is conditional on **both** the region and the model family:
+
+| Your region | Prefix | Models prefixed |
+|-------------|--------|-----------------|
+| `us-*` (except GovCloud) | `us.` | Claude, Nova, DeepSeek |
+| `eu-*` | `eu.` | Claude, Nova Lite/Micro, Llama 3, Pixtral |
+| `ap-northeast-1` (Tokyo) | `jp.` | Claude, Nova Lite/Micro/Pro |
+| `ap-southeast-2`, `ap-southeast-4` (Australia) | `au.` | Claude Sonnet 4.5, Claude Haiku |
+| Other `ap-*` | `apac.` | Claude, Nova Lite/Micro/Pro |
+
+Models not listed in the table for a given region are **not** prefixed.
+
+**If your gateway expects the prefixed ID** (e.g., `us.anthropic.claude-sonnet-4-6-v1`), no changes are needed — this is the default behavior for supported models.
+
+**If your gateway requires a specific prefixed model ID**, you can force that exact ID by including the recognized prefix yourself:
+
+```json
+{
+  "model": "amazon-bedrock/us.anthropic.claude-sonnet-4-6-v1"
+}
+```
+
+When the model ID already starts with a recognized prefix (`us.`, `eu.`, `global.`, `jp.`, `apac.`, `au.`), auto-prefixing is skipped and the ID is passed through as-is. Note that this does **not** strip the prefix — the full prefixed ID is what gets sent to the gateway.
+
+!!! warning
+    There is currently no config option to disable auto-prefixing entirely. If your gateway requires bare (unprefixed) model IDs and the model would normally be prefixed, contact your platform team or open an issue.
+
+## Troubleshooting
+
+### Verify credentials and config
+
+```bash
+altimate-code providers list
+```
+
+This shows all stored credentials and active environment variables. You should see `Amazon Bedrock` listed under credentials or environment.
+
+### Check config resolution
+
+Look for these lines in the logs (`~/.local/share/altimate-code/log/*.log`):
+
+| Log line | Meaning |
+|----------|---------|
+| `service=config loading config from ...altimate-code.json` | Config file is being read |
+| `service=provider providerID=amazon-bedrock found` | Provider detected successfully |
+| `service=provider providerID=amazon-bedrock` + error | Auth or endpoint failure |
+
+### Enable debug logging
+
+For detailed output including credential chain steps and SDK-level request info:
+
+```bash
+altimate-code --log-level DEBUG
+```
+
+## Full config reference
+
+```json
+{
+  "model": "amazon-bedrock/anthropic.claude-sonnet-4-6-v1",
+  "provider": {
+    "amazon-bedrock": {
+      "options": {
+        "baseURL": "https://your-gateway.example.com/bedrock/v1",
+        "region": "us-east-1",
+        "profile": "my-aws-profile"
+      }
+    }
+  }
+}
+```
+
+| Option | Type | Description |
+|--------|------|-------------|
+| `baseURL` | `string` | Custom API gateway URL. Overrides the default Bedrock endpoint. |
+| `endpoint` | `string` | Alias for `baseURL`. If both are set, `endpoint` takes precedence. |
+| `region` | `string` | AWS region. Falls back to `AWS_REGION` env var, then `us-east-1`. |
+| `profile` | `string` | AWS named profile. Falls back to `AWS_PROFILE` env var. |
diff --git a/docs/docs/configure/models.md b/docs/docs/configure/models.md
index 6b13c7ffc..726832ab5 100644
--- a/docs/docs/configure/models.md
+++ b/docs/docs/configure/models.md
@@ -73,7 +73,7 @@ Models are referenced as `provider/model-name`:
 |----------|--------------|
 | Anthropic | `anthropic/claude-sonnet-4-6` |
 | OpenAI | `openai/gpt-4o` |
-| AWS Bedrock | `bedrock/anthropic.claude-sonnet-4-6-v1` |
+| Amazon Bedrock | `amazon-bedrock/anthropic.claude-sonnet-4-6-v1` |
 | Azure | `azure/gpt-4o` |
 | Google | `google/gemini-2.5-pro` |
 | Ollama | `ollama/llama3.1` |
diff --git a/docs/docs/configure/providers.md b/docs/docs/configure/providers.md
index c4aceb52e..af2355af9 100644
--- a/docs/docs/configure/providers.md
+++ b/docs/docs/configure/providers.md
@@ -69,25 +69,45 @@ Available models: `claude-opus-4-6`, `claude-sonnet-4-6`, `claude-haiku-4-5-2025
 }
 ```
 
-## AWS Bedrock
+## Amazon Bedrock
 
 ```json
 {
   "provider": {
-    "bedrock": {
-      "region": "us-east-1",
-      "accessKeyId": "{env:AWS_ACCESS_KEY_ID}",
-      "secretAccessKey": "{env:AWS_SECRET_ACCESS_KEY}"
+    "amazon-bedrock": {
+      "options": {
+        "region": "us-east-1"
+      }
     }
   },
-  "model": "bedrock/anthropic.claude-sonnet-4-6-v1"
+  "model": "amazon-bedrock/anthropic.claude-sonnet-4-6-v1"
 }
 ```
 
-Uses the standard AWS credential chain. Set `AWS_PROFILE` or provide credentials directly.
+Uses the standard AWS credential chain: environment variables (`AWS_ACCESS_KEY_ID`/`AWS_SECRET_ACCESS_KEY`), named profiles (`AWS_PROFILE`), SSO sessions, IAM roles, and container credentials.
 
 !!! note
-    If you have AWS SSO or IAM roles configured, Bedrock will use your default credential chain automatically, so no explicit keys are needed.
+    If you have AWS SSO, IAM roles, or environment credentials (`AWS_ACCESS_KEY_ID` / `AWS_SECRET_ACCESS_KEY`) configured, Bedrock will use your default credential chain automatically.
+
+### Custom Endpoints (API Gateways)
+
+If your organization routes Bedrock traffic through a custom API gateway or proxy, set the `baseURL` in the provider options:
+
+```json
+{
+  "provider": {
+    "amazon-bedrock": {
+      "options": {
+        "baseURL": "https://your-gateway.example.com/v1",
+        "region": "us-east-1"
+      }
+    }
+  },
+  "model": "amazon-bedrock/anthropic.claude-sonnet-4-6-v1"
+}
+```
+
+For a complete walkthrough — including bearer token authentication, cross-region model IDs, and troubleshooting — see the [Amazon Bedrock Custom Endpoints guide](bedrock-custom-endpoints.md).
 
 ## Azure OpenAI
 
@@ -310,8 +330,8 @@ The `small_model` is used for lightweight tasks like summarization and context c
 | `baseURL` | `string` | Custom API endpoint URL |
 | `api` | `string` | API type (e.g., `"openai"` for compatible endpoints) |
 | `headers` | `object` | Custom HTTP headers to include with requests |
-| `region` | `string` | AWS region (Bedrock only) |
-| `accessKeyId` | `string` | AWS access key (Bedrock only) |
-| `secretAccessKey` | `string` | AWS secret key (Bedrock only) |
+| `options.region` | `string` | AWS region (Amazon Bedrock only, default: `us-east-1`) |
+| `options.profile` | `string` | AWS named profile (Amazon Bedrock only) |
+| `options.baseURL` | `string` | Custom endpoint URL for Bedrock gateway/proxy (Amazon Bedrock only) |
 | `project` | `string` | GCP project ID (Google Vertex AI only) |
 | `location` | `string` | GCP region (Google Vertex AI only, default: `us-central1`) |
diff --git a/docs/docs/getting-started/quickstart.md b/docs/docs/getting-started/quickstart.md
index a62fff4ac..551aaa6dc 100644
--- a/docs/docs/getting-started/quickstart.md
+++ b/docs/docs/getting-started/quickstart.md
@@ -75,21 +75,24 @@ Switch providers at any time by updating the `provider` and `model` fields in `a
     }
     ```
 
-=== "AWS Bedrock"
+=== "Amazon Bedrock"
 
     ```json
     {
       "provider": {
-        "bedrock": {
-          "region": "us-east-1",
-          "accessKeyId": "{env:AWS_ACCESS_KEY_ID}",
-          "secretAccessKey": "{env:AWS_SECRET_ACCESS_KEY}"
+        "amazon-bedrock": {
+          "options": {
+            "region": "us-east-1"
+          }
         }
       },
-      "model": "bedrock/anthropic.claude-sonnet-4-6-v1"
+      "model": "amazon-bedrock/anthropic.claude-sonnet-4-6-v1"
     }
     ```
 
+    Uses the standard AWS credential chain (`AWS_PROFILE`, `AWS_ACCESS_KEY_ID`/`AWS_SECRET_ACCESS_KEY`, IAM roles, SSO).
+    For custom API gateways, see [Bedrock Custom Endpoints](../configure/bedrock-custom-endpoints.md).
+
 === "Azure OpenAI"
 
     ```json
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 88310510d..92c2a529a 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -119,6 +119,7 @@ nav:
       - LLMs:
           - Providers: configure/providers.md
           - Models: configure/models.md
+          - Bedrock Custom Endpoints: configure/bedrock-custom-endpoints.md
       - MCPs & ACPs:
           - MCP Servers: configure/mcp-servers.md
           - ACP Support: configure/acp.md