diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index 223a1a87..578467b0 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -163,4 +163,4 @@ def example_history(self):
     ...
 ```
 
-[exchange]: https://github.com/block-open-source/goose/tree/main/packages/exchange
+[exchange]: https://github.com/block/goose/tree/main/packages/exchange
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index deea3821..ff5f841d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -95,14 +95,14 @@ In order to release a new version of goose, you need to do the following:
 2. Update version in `pyproject.toml` for `goose` and package dependencies such as `exchange`
 3. Create a PR and merge it into main branch
 4. Tag the HEAD commit in main branch. To do this, switch to main branch and run: `just tag-push`
-5. Publish a new release from the [Github Release UI](https://github.com/block-open-source/goose/releases)
+5. Publish a new release from the [Github Release UI](https://github.com/block/goose/releases)
 
 
-[issues]: https://github.com/block-open-source/goose/issues
+[issues]: https://github.com/block/goose/issues
 [goose-plugins]: https://github.com/block-open-source/goose-plugins
-[ai-exchange]: https://github.com/block-open-source/goose/tree/main/packages/exchange
-[developer]: https://github.com/block-open-source/goose/blob/dfecf829a83021b697bf2ecc1dbdd57d31727ddd/src/goose/toolkit/developer.py
+[ai-exchange]: https://github.com/block/goose/tree/main/packages/exchange
+[developer]: https://github.com/block/goose/blob/dfecf829a83021b697bf2ecc1dbdd57d31727ddd/src/goose/toolkit/developer.py
 [uv]: https://docs.astral.sh/uv/
 [ruff]: https://docs.astral.sh/ruff/
 [just]: https://github.com/casey/just
-[adding-toolkit]: https://block-open-source.github.io/goose/configuration.html#adding-a-toolkit
+[adding-toolkit]: https://block.github.io/goose/configuration.html#adding-a-toolkit
diff --git a/README.md b/README.md
index 0cbaf35e..2e7fd863 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Goose is your on-machine developer agent, automating engineering tasks seamlessl
 </p>
 
 <p align="center">
-  <a href="https://block-open-source.github.io/goose/">
+  <a href="https://block.github.io/goose/">
     <img src="https://img.shields.io/badge/Documentation-goose_docs-teal">
   </a>
   <a href=https://pypi.org/project/goose-ai>
@@ -225,19 +225,19 @@ Let us know what you think in our [Discussions][discussions] or the [**`#goose`*
 [goose-plugins]: https://github.com/block-open-source/goose-plugins
 
 [pipx]: https://github.com/pypa/pipx?tab=readme-ov-file#install-pipx
-[contributing]: https://github.com/block-open-source/goose/blob/main/CONTRIBUTING.md
-[license]: https://github.com/block-open-source/goose/blob/main/LICENSE
+[contributing]: https://github.com/block/goose/blob/main/CONTRIBUTING.md
+[license]: https://github.com/block/goose/blob/main/LICENSE
 
-[goose-docs]: https://block-open-source.github.io/goose/
-[toolkits]: https://block-open-source.github.io/goose/plugins/available-toolkits.html
-[configuration]: https://block-open-source.github.io/goose/configuration.html
-[cli]: https://block-open-source.github.io/goose/plugins/cli.html
-[providers]: https://block-open-source.github.io/goose/providers.html
-[use-cases]: https://block-open-source.github.io/goose/guidance/applications.html
-[getting-started]: https://block-open-source.github.io/goose/guidance/getting-started.html
+[goose-docs]: https://block.github.io/goose/
+[toolkits]: https://block.github.io/goose/plugins/available-toolkits.html
+[configuration]: https://block.github.io/goose/configuration.html
+[cli]: https://block.github.io/goose/plugins/cli.html
+[providers]: https://block.github.io/goose/providers.html
+[use-cases]: https://block.github.io/goose/guidance/applications.html
+[getting-started]: https://block.github.io/goose/guidance/getting-started.html
 
 [discord-invite]: https://discord.gg/7GaTvbDwga
-[gh-issues]: https://github.com/block-open-source/goose/issues
+[gh-issues]: https://github.com/block/goose/issues
 [van-code]: https://github.com/block-open-source/goose-plugins/blob/de98cd6c29f8e7cd3b6ace26535f24ac57c9effa/src/goose_plugins/toolkits/artify.py
-[discussions]: https://github.com/block-open-source/goose/discussions
+[discussions]: https://github.com/block/goose/discussions
 [goose-channel]: https://discord.com/channels/1287729918100246654/1287729920319033345
diff --git a/docs/index.md b/docs/index.md
index ec8e7e5e..7f535814 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -10,7 +10,7 @@ Goose is your on-machine developer agent, automating engineering tasks seamlessl
 </p>
 
 <p align="center">
-  <a href="https://block-open-source.github.io/goose/">
+  <a href="https://block.github.io/goose/">
     <img src="https://img.shields.io/badge/Documentation-goose_docs-teal">
   </a>
   <a href=https://pypi.org/project/goose-ai>
@@ -167,19 +167,19 @@ Let us know what you think in our [Discussions][discussions] or the [**`#goose`*
 [goose-plugins]: https://github.com/block-open-source/goose-plugins
 
 [pipx]: https://github.com/pypa/pipx?tab=readme-ov-file#install-pipx
-[contributing]: https://github.com/block-open-source/goose/blob/main/CONTRIBUTING.md
-[license]: https://github.com/block-open-source/goose/blob/main/LICENSE
+[contributing]: https://github.com/block/goose/blob/main/CONTRIBUTING.md
+[license]: https://github.com/block/goose/blob/main/LICENSE
 
-[goose-docs]: https://block-open-source.github.io/goose/
-[toolkits]: https://block-open-source.github.io/goose/plugins/available-toolkits.html
-[configuration]: https://block-open-source.github.io/goose/configuration.html
-[cli]: https://block-open-source.github.io/goose/plugins/cli.html
-[providers]: https://block-open-source.github.io/goose/providers.html
-[use-cases]: https://block-open-source.github.io/goose/guidance/applications.html
-[getting-started]: https://block-open-source.github.io/goose/guidance/getting-started.html
+[goose-docs]: https://block.github.io/goose/
+[toolkits]: https://block.github.io/goose/plugins/available-toolkits.html
+[configuration]: https://block.github.io/goose/configuration.html
+[cli]: https://block.github.io/goose/plugins/cli.html
+[providers]: https://block.github.io/goose/providers.html
+[use-cases]: https://block.github.io/goose/guidance/applications.html
+[getting-started]: https://block.github.io/goose/guidance/getting-started.html
 
 [discord-invite]: https://discord.gg/7GaTvbDwga
-[gh-issues]: https://github.com/block-open-source/goose/issues
+[gh-issues]: https://github.com/block/goose/issues
 [van-code]: https://github.com/block-open-source/goose-plugins/blob/de98cd6c29f8e7cd3b6ace26535f24ac57c9effa/src/goose_plugins/toolkits/artify.py
-[discussions]: https://github.com/block-open-source/goose/discussions
+[discussions]: https://github.com/block/goose/discussions
 [goose-channel]: https://discord.com/channels/1287729918100246654/1287729920319033345
diff --git a/docs/plugins/providers.md b/docs/plugins/providers.md
index 63e5e80f..6e1f0311 100644
--- a/docs/plugins/providers.md
+++ b/docs/plugins/providers.md
@@ -12,4 +12,4 @@ Providers in Goose mean "LLM providers" that Goose can interact with. Providers
 * Ollama
 * OpenAI
 
-[exchange-providers]: https://github.com/block-open-source/goose/tree/main/packages/exchange/src/exchange/providers
+[exchange-providers]: https://github.com/block/goose/tree/main/packages/exchange/src/exchange/providers
diff --git a/mkdocs.yml b/mkdocs.yml
index df77335e..48bad826 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,10 +1,10 @@
 site_name: Goose Documentation
 site_author: Block
 site_description: Documentation for Goose
-repo_url: https://github.com/block-open-source/goose
-repo_name: "block-open-source/goose"
-edit_uri: "https://github.com/block-open-source/goose/blob/main/docs/"
-site_url: "https://block-open-source.github.io/goose/"
+repo_url: https://github.com/block/goose
+repo_name: "block/goose"
+edit_uri: "https://github.com/block/goose/blob/main/docs/"
+site_url: "https://block.github.io/goose/"
 use_directory_urls: false
 # theme
 theme:
@@ -56,7 +56,7 @@ plugins:
   - git-committers: # Show git committers
       branch: main
       enabled: !ENV [ENV_PROD, false]
-      repository: block-open-source/goose
+      repository: block/goose
   - git-revision-date-localized: # Show git revision date
       enable_creation_date: true
       enabled: !ENV [ENV_PROD, false]
diff --git a/src/goose/utils/_create_exchange.py b/src/goose/utils/_create_exchange.py
index d1aa318f..de3170eb 100644
--- a/src/goose/utils/_create_exchange.py
+++ b/src/goose/utils/_create_exchange.py
@@ -23,7 +23,7 @@ def create_exchange(profile: Profile, notifier: SessionNotifier) -> Exchange:
     except InvalidChoiceError as e:
         error_message = (
             f"[bold red]{e.message}[/bold red].\nPlease check your configuration file at {PROFILES_CONFIG_PATH}.\n"
-            + "Configuration doc: https://block-open-source.github.io/goose/configuration.html"
+            + "Configuration doc: https://block.github.io/goose/configuration.html"
         )
         print(error_message)
         sys.exit(1)