diff --git a/.github/workflows/cfn-publish.yml b/.github/workflows/cfn-publish.yml
index 549304d..696dfe3 100644
--- a/.github/workflows/cfn-publish.yml
+++ b/.github/workflows/cfn-publish.yml
@@ -6,7 +6,7 @@ name: Publish CloudFormation template
 # every change and every release tag.
 #
 # One-time setup (repo admin):
-#   1. Create an S3 bucket (default name: compass-cloudformation, us-east-1)
+#   1. Create an S3 bucket (default name: runcaptain-compass-cloudformation, us-east-1)
 #      with a bucket policy allowing public s3:GetObject on *.yaml.
 #   2. Repo settings -> Secrets: CFN_PUBLISH_AWS_ACCESS_KEY_ID /
 #      CFN_PUBLISH_AWS_SECRET_ACCESS_KEY (an IAM user with PutObject on the
@@ -48,7 +48,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.CFN_PUBLISH_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.CFN_PUBLISH_AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-east-1
-          BUCKET: ${{ vars.CFN_TEMPLATE_BUCKET || 'compass-cloudformation' }}
+          BUCKET: ${{ vars.CFN_TEMPLATE_BUCKET || 'runcaptain-compass-cloudformation' }}
         run: |
           aws s3 cp deploy/cloudformation/compass-quickstart.yaml "s3://$BUCKET/compass-quickstart.yaml"
           # Versioned copy on tags so old buttons keep working forever.
diff --git a/README.md b/README.md
index 3ee3d25..883a1e2 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
   [![Image](https://img.shields.io/badge/ghcr.io-runcaptain%2Fcompass-2496ED?logo=docker&logoColor=white)](https://github.com/runcaptain/compass/pkgs/container/compass)
   [![Deploy](https://img.shields.io/badge/%E2%98%81%20one--command%20deploy-Kubernetes%20%2F%20AWS-326CE5?logo=kubernetes&logoColor=white)](#deploy-to-kubernetes--aws-one-command)
   <br>
-  <a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?stackName=compass&templateURL=https://compass-cloudformation.s3.amazonaws.com/compass-quickstart.yaml"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack on AWS"></a>
+  <a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?stackName=compass&templateURL=https://runcaptain-compass-cloudformation.s3.amazonaws.com/compass-quickstart.yaml"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack on AWS"></a>
 </div>
 
 Built by [Captain](https://runcaptain.com) for high-throughput retrieval in on-prem enterprise deployments where customer data cannot leave their VPC.
@@ -434,7 +434,7 @@ with everything pre-filled; one Create click gives you a running serverless
 Compass (Fargate task + private encrypted S3 bucket + least-privilege IAM,
 no long-lived keys — the task role is picked up automatically):
 
-<a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?stackName=compass&templateURL=https://compass-cloudformation.s3.amazonaws.com/compass-quickstart.yaml"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack on AWS"></a>
+<a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?stackName=compass&templateURL=https://runcaptain-compass-cloudformation.s3.amazonaws.com/compass-quickstart.yaml"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack on AWS"></a>
 
 The bucket is retained when the stack is deleted — your data outlives the
 compute, always. Template source: [`deploy/cloudformation/compass-quickstart.yaml`](deploy/cloudformation/compass-quickstart.yaml).
diff --git a/deploy/README.md b/deploy/README.md
index fa8cdc5..044b528 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -5,7 +5,7 @@ binary; topology background lives in [docs/deployment.md](../docs/deployment.md)
 
 ## 0. One click (AWS CloudFormation)
 
-<a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?stackName=compass&templateURL=https://compass-cloudformation.s3.amazonaws.com/compass-quickstart.yaml"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack on AWS"></a>
+<a href="https://console.aws.amazon.com/cloudformation/home?region=us-east-1#/stacks/quickcreate?stackName=compass&templateURL=https://runcaptain-compass-cloudformation.s3.amazonaws.com/compass-quickstart.yaml"><img src="https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png" alt="Launch Stack on AWS"></a>
 
 [`cloudformation/compass-quickstart.yaml`](cloudformation/compass-quickstart.yaml)
 creates a self-contained stack: minimal VPC, private encrypted S3 bucket