diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7bd3dcc..f494549 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ Contributions are welcome and very much appreciated!
 We accept code contributions through pull requests.
 In short, this is how that works.
 
-1. Fork [the repository](https://github.com/gramaziokohler/compas_pb) and clone the fork.
+1. Fork [the repository](https://github.com/compas-dev/compas_pb) and clone the fork.
 2. Create a virtual environment using your tool of choice (e.g. `virtualenv`, `conda`, etc).
 3. Install development dependencies:
 
@@ -43,7 +43,7 @@ command line to ease recurring operations:
 
 ## Bug reports
 
-When [reporting a bug](https://github.com/gramaziokohler/compas_pb/issues) please include:
+When [reporting a bug](https://github.com/compas-dev/compas_pb/issues) please include:
 
 * Operating system name and version.
 * Any details about your local setup that might be helpful in troubleshooting.
@@ -51,7 +51,7 @@ When [reporting a bug](https://github.com/gramaziokohler/compas_pb/issues) pleas
 
 ## Feature requests
 
-When [proposing a new feature](https://github.com/gramaziokohler/compas_pb/issues) please include:
+When [proposing a new feature](https://github.com/compas-dev/compas_pb/issues) please include:
 
 * Explain in detail how it would work.
 * Keep the scope as narrow as possible, to make it easier to implement.
diff --git a/README.md b/README.md
index 0620367..a538745 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@
 <p align="center">
     <a href="https://pypi.org/project/compas_pb/"><img src="https://img.shields.io/pypi/v/compas_pb.svg" alt="PyPI version"></a>
     <a href="https://pypi.org/project/compas_pb/"><img src="https://img.shields.io/pypi/pyversions/compas_pb.svg" alt="Python versions"></a>
-    <a href="https://github.com/gramaziokohler/compas_pb/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License MIT"></a>
-    <a href="https://github.com/gramaziokohler/compas_pb/actions"><img src="https://github.com/gramaziokohler/compas_pb/actions/workflows/build.yml/badge.svg" alt="Build Status"></a>
-    <a href="https://gramaziokohler.github.io/compas_pb"><img src="https://img.shields.io/badge/docs-latest-brightgreen.svg" alt="Documentation"></a>
+    <a href="https://github.com/compas-dev/compas_pb/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License MIT"></a>
+    <a href="https://github.com/compas-dev/compas_pb/actions"><img src="https://github.com/compas-dev/compas_pb/actions/workflows/build.yml/badge.svg" alt="Build Status"></a>
+    <a href="https://compas.dev/compas_pb"><img src="https://img.shields.io/badge/docs-latest-brightgreen.svg" alt="Documentation"></a>
     <a href="https://compas.dev/mission-control/#compas_pb"><img src="https://compas.dev/badge.svg" alt="Made with COMPAS"></a>
 </p>
 
diff --git a/docs/installation.md b/docs/installation.md
index e39a625..3cce3bb 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -13,7 +13,7 @@ pip install compas_pb
 The latest version can be installed from local source.
 
 ```bash
-git clone https://github.com/gramaziokohler/compas_pb.git
+git clone https://github.com/compas-dev/compas_pb.git
 cd compas_pb
 pip install -e .
 ```
@@ -23,7 +23,7 @@ pip install -e .
 To install `compas_pb` for development, install from local source with the "dev" requirements.
 
 ```bash
-git clone https://github.com/gramaziokohler/compas_pb.git
+git clone https://github.com/compas-dev/compas_pb.git
 cd compas_pb
 pip install -e .[dev]
 ```
diff --git a/docs/protobuf.rst b/docs/protobuf.rst
index 62b6433..995a610 100644
--- a/docs/protobuf.rst
+++ b/docs/protobuf.rst
@@ -2,4 +2,4 @@
 Protobuf Definitions
 ********************************************************************************
 
-An auto-generated documentation of the available protobuf definitions can be found `here <https://gramaziokohler.github.io/compas_pb/latest/_static/protobuf/index.html>`_.
+An auto-generated documentation of the available protobuf definitions can be found `here <https://compas.dev/compas_pb/latest/_static/protobuf/index.html>`_.
diff --git a/mkdocs.yml b/mkdocs.yml
index 7dd7b27..956dd19 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,13 +1,14 @@
 site_name: COMPAS Protobuf
-site_url: https://gramaziokohler.github.io/compas_pb/
+site_url: https://compas.dev/compas_pb/
 
-repo_name: gramaziokohler
-repo_url: https://github.com/gramaziokohler/compas_pb/
+repo_name: compas-dev/compas_pb
+edit_uri: blob/main/docs/
+repo_url: https://github.com/compas-dev/compas_pb/
 
 copyright: Copyright &copy; 2024 - 2025, ETH Zurich - Gramazio Kohler Research
 
 extra:
-  homepage: https://gramaziokohler.github.io/compas_pb/
+  homepage: https://compas.dev/compas_pb/
   version:
     provider: mike
 
diff --git a/pyproject.toml b/pyproject.toml
index 1aa01b9..ce60a9c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,11 +71,11 @@ docs = [
 compas_pb = "compas_pb.cli:main"
 
 [project.urls]
-Homepage = "https://gramaziokohler.github.io/compas_pb"
-Documentation = "https://gramaziokohler.github.io/compas_pb"
-Repository = "https://github.com/gramaziokohler/compas_pb"
-Changelog = "https://github.com/gramaziokohler/compas_pb/blob/main/CHANGELOG.md"
-Issues = "https://github.com/gramaziokohler/compas_pb/issues"
+Homepage = "https://compas.dev/compas_pb"
+Documentation = "https://compas.dev/compas_pb"
+Repository = "https://github.com/compas-dev/compas_pb"
+Changelog = "https://github.com/compas-dev/compas_pb/blob/main/CHANGELOG.md"
+Issues = "https://github.com/compas-dev/compas_pb/issues"
 Forum = "https://forum.compas-framework.org/"
 
 # ============================================================================