diff --git a/0000-template.md b/0000-template.md
index ec7103c..798e93a 100644
--- a/0000-template.md
+++ b/0000-template.md
@@ -1,7 +1,7 @@
 - Feature Name: (fill with a unique identifier, `my_feature_name`)
 - Start Date: (fill with today's date, YYYY-MM-DD)
-- RFC PR: [rfcs#0000](https://github.com/unicity-astrid/rfcs/pull/0000)
-- Tracking Issue: [astrid#0000](https://github.com/unicity-astrid/astrid/issues/0000)
+- RFC PR: [rfcs#0000](https://github.com/astrid-runtime/rfcs/pull/0000)
+- Tracking Issue: [astrid#0000](https://github.com/astrid-runtime/astrid/issues/0000)
 
 # Summary
 [summary]: #summary
diff --git a/README.md b/README.md
index 05ceed6..c32c4e5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![License: MIT OR Apache-2.0](https://img.shields.io/badge/License-MIT%20OR%20Apache--2.0-blue.svg)](LICENSE-MIT)
 
-**Design proposals for changes to [Astrid's](https://github.com/unicity-astrid/astrid) kernel-to-user-space contract.**
+**Design proposals for changes to [Astrid's](https://github.com/astrid-runtime/astrid) kernel-to-user-space contract.**
 
 RFCs govern any substantial change to the contract surface between the kernel
 and user-space: the host ABI, IPC protocol, capability model, manifest schema,
diff --git a/book.toml b/book.toml
index cd90d03..47730aa 100644
--- a/book.toml
+++ b/book.toml
@@ -4,7 +4,7 @@ title = "The Astrid RFC Book"
 [output.html]
 smart-punctuation = true
 no-section-label = true
-git-repository-url = "https://github.com/unicity-astrid/rfcs"
+git-repository-url = "https://github.com/astrid-runtime/rfcs"
 site-url = "/rfcs/"
 
 [output.html.search]
diff --git a/text/0001-rfc-process.md b/text/0001-rfc-process.md
index db998b8..11ec134 100644
--- a/text/0001-rfc-process.md
+++ b/text/0001-rfc-process.md
@@ -71,7 +71,7 @@ You do not need an RFC for:
 
 ## How to submit
 
-1. Fork the [rfcs](https://github.com/unicity-astrid/rfcs) repository.
+1. Fork the [rfcs](https://github.com/astrid-runtime/rfcs) repository.
 2. Copy `0000-template.md` to `text/0000-my-feature.md` (descriptive name,
    do not assign an RFC number).
 3. Fill in the RFC. Focus on motivation and the reference-level specification.
@@ -128,7 +128,7 @@ RFCs use the template at `0000-template.md`. The header fields are:
 | Feature Name | A unique `snake_case` identifier. |
 | Start Date | The date the RFC was first submitted (YYYY-MM-DD). |
 | RFC PR | Link to the pull request(s) where the RFC was discussed. |
-| Tracking Issue | Link to the implementation tracking issue in `unicity-astrid/astrid`, if applicable. |
+| Tracking Issue | Link to the implementation tracking issue in `astrid-runtime/astrid`, if applicable. |
 
 ## Required sections