diff --git a/README.md b/README.md
index cbc5c8c..c7e5711 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ provide access to keys listed in the DynamoDB Permissions table for the caller's
 IAM entity.
 
 The agent can be installed from the Debian packages attached to the
-[GitHub releases](https://github.com/keithduncan/iam-ssh-agent/releases) or
+[GitHub releases](https://github.com/buildkite/iam-ssh-agent/releases) or
 using `cargo` to build the binary yourself. It is also published to Docker hub
 as [keithduncan/iam-ssh-agent](https://hub.docker.com/r/keithduncan/iam-ssh-agent).
 
@@ -264,9 +264,9 @@ for more tips on troubleshooting access to Private API Gateways.
 
 ## Testing Access
 
-I use this project to provide my [Buildkite](https://buildkite.com) agents
-[running on ECS](https://github.com/keithduncan/buildkite-on-demand) access to
-ssh keys for cloning private source code repositories. The same pattern is
+This project can be used to grant [Buildkite](https://buildkite.com) agents
+[running on ECS](https://github.com/buildkite/on-demand) permission to use
+ssh private keys to clone private source code repositories. The same pattern is
 also applicable to init system managed virtual machines on EC2, or
 Kubernetes pods on EKS.
 
@@ -380,5 +380,5 @@ ProjectRole:
 ```
 
 For more details on running Buildkite agents on-demand with ECS see my
-[agent-scheduler](https://github.com/keithduncan/buildkite-on-demand/tree/master/agent-scheduler)
+[agent-scheduler](https://github.com/buildkite/on-demand/tree/master/agent-scheduler)
 project.
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
index 595765e..8c4591d 100644
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -4,7 +4,7 @@ description = "ssh-agent compatible daemon that forwards list-keys and sign-data
 version = "0.3.1"
 authors = ["Keith Duncan <keith_duncan@me.com>"]
 edition = "2018"
-repository = "https://github.com/keithduncan/iam-ssh-agent"
+repository = "https://github.com/buildkite/iam-ssh-agent"
 license = "BSD-3-Clause"
 keywords = [ "ssh", "ssh-agent", "aws" ]
 categories = [ "command-line-utilities", "development-tools" ]
diff --git a/agent/README.md b/agent/README.md
index 80fc5df..9020333 100644
--- a/agent/README.md
+++ b/agent/README.md
@@ -1,6 +1,6 @@
 # iam-ssh-agent agent
 
-Binary replacement for `ssh-agent` that uses an [iam-ssh-agent](https://github.com/keithduncan/iam-ssh-agent)
+Binary replacement for `ssh-agent` that uses an [iam-ssh-agent](https://github.com/buildkite/iam-ssh-agent)
 backend for `list keys` and `sign data` operations.
 
 The artifacts built from this crate are:
diff --git a/service/README_SAR.md b/service/README_SAR.md
index 5c5f526..de54098 100644
--- a/service/README_SAR.md
+++ b/service/README_SAR.md
@@ -11,5 +11,5 @@ repositories without granting access to the raw key material.
 socket with the ssh-agent protocol, and a serverless API that uses API Gateway
 and Lambda functions to answer `list keys` and `sign data` requests.
 
-See the [GitHub repository](https://github.com/keithduncan/iam-ssh-agent) for
+See the [GitHub repository](https://github.com/buildkite/iam-ssh-agent) for
 more documentation.
\ No newline at end of file
diff --git a/service/ssh-agent-backend/package.json b/service/ssh-agent-backend/package.json
index 0d4a390..ce89b7b 100644
--- a/service/ssh-agent-backend/package.json
+++ b/service/ssh-agent-backend/package.json
@@ -2,7 +2,7 @@
   "name": "ssh-agent-backend",
   "version": "0.1.0",
   "description": "iam-ssh-agent backend lambda functions",
-  "repository": "https://github.com/keithduncan/iam-ssh-agent",
+  "repository": "https://github.com/buildkite/iam-ssh-agent",
   "author": "Keith Duncan",
   "license": "MIT",
   "dependencies": {
diff --git a/service/template.yaml b/service/template.yaml
index 10ce86a..f285a82 100644
--- a/service/template.yaml
+++ b/service/template.yaml
@@ -49,8 +49,8 @@ Metadata:
     LicenseUrl: ../LICENSE
     ReadmeUrl: README_SAR.md
     Labels: ['ssh', 'ssh-agent', 'ssh-keys', 'authentication']
-    HomePageUrl: https://github.com/keithduncan/iam-ssh-agent
-    SourceCodeUrl: https://github.com/keithduncan/iam-ssh-agent
+    HomePageUrl: https://github.com/buildkite/iam-ssh-agent
+    SourceCodeUrl: https://github.com/buildkite/iam-ssh-agent
 
 # More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
 Globals: