diff --git a/index.md b/index.md
index e693b698..877cad77 100644
--- a/index.md
+++ b/index.md
@@ -165,7 +165,7 @@ Thinking about using Anbox Cloud for your next project? [Get in touch!](https://
 | 1 | explanation/landing | [Explanation](https://discourse.ubuntu.com/t/explanation/28829) |
 | 2 | explanation/anbox-cloud | [Anbox Cloud](https://discourse.ubuntu.com/t/anbox-cloud-overview/17802) |
 | 2 | explanation/rendering-architecture | [Rendering architecture](https://discourse.ubuntu.com/t/about-rendering-architecture/35129) |
-| 2 | explanation/aaos | [AAOS](tbd)|
+| 2 | explanation/aaos | [AAOS](https://discourse.ubuntu.com/t/android-automotive-os-aaos/44274)|
 | 2 | explanation/security | [Security](https://discourse.ubuntu.com/t/about-security/31217)|
 | 2 | explanation/ams | [AMS](https://discourse.ubuntu.com/t/about-ams/24321)|
 | 2 | explanation/aar | [AAR](https://discourse.ubuntu.com/t/application-registry/17761)|
@@ -186,7 +186,8 @@ Thinking about using Anbox Cloud for your next project? [Get in touch!](https://
 | 0 | | |
 | 1 | |[Documentation feedback](https://forms.gle/6yzgLbwN8rVYSdvG9)|
 | 0 | | |
-|   | reference/release-notes/1.21.1 | [Release notes - Anbox Cloud 1.21.1](https://discourse.ubuntu.com/t/43279)|
+|   | reference/release-notes/1.21.1 | [Release notes-Anbox Cloud 1.21.2](https://discourse.ubuntu.com/t/44276)|
+|   | reference/release-notes/1.21.1 | [Release notes-Anbox Cloud 1.21.1](https://discourse.ubuntu.com/t/43279)|
 |   | reference/release-notes/1.21.0 | [Release notes-Anbox Cloud 1.21.0](https://discourse.ubuntu.com/t/42429)|
 |   | reference/release-notes/1.20.2 | [Release notes-Anbox Cloud 1.20.2](https://discourse.ubuntu.com/t/41686)|
 |   | reference/release-notes/1.20.1 | [Release notes-Anbox Cloud 1.20.1](https://discourse.ubuntu.com/t/40988)|
diff --git a/reference/release-notes/release-notes.md b/reference/release-notes/release-notes.md
index a81a1a85..85032e60 100644
--- a/reference/release-notes/release-notes.md
+++ b/reference/release-notes/release-notes.md
@@ -15,7 +15,7 @@ The following dates for upcoming releases are not final and could vary depending
 
 | Release date   |  Release notes  |
 |----|----|
-| April 18 2024 | [Anbox Cloud 1.21.2](tbd) |
+| April 18 2024 | [Anbox Cloud 1.21.2](https://discourse.ubuntu.com/t/44276) |
 | March 13 2024 | [Anbox Cloud 1.21.1](https://discourse.ubuntu.com/t/43279) |
 | February 14 2024 | [Anbox Cloud 1.21.0](https://discourse.ubuntu.com/t/42429) |