diff --git a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
index 1d563a2646d30bcc3d35ff1246a62d6316c763d5..57c807758e318119a0c49ea06c3e2ca8596d57ef 100644
--- a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
+++ b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
@@ -33,6 +33,7 @@ Summary: Tails infra merge roadmap.
 | Tor Browser archive ([git-annex][])        | Tails Team                    | low        |         |
 | [BitTorrent][] (Transmission)              | Tails Team                    | low        |         |
 | [Whisperback][] (postfix, onion)           | Tails Team                    | low        |         |
+| [Website][] (IkiWiki)                      | Tails Team                    | medium     |         |
 | APT snapshots ([time-based][], [tagged][]) | Tails Team                    | high       |         |
 
 ### Merge
@@ -82,7 +83,6 @@ Summary: Tails infra merge roadmap.
 | [Authentication][] ([puppet-rbac])         | TPA                           | high       |         |
 | [Mirror pool][] (Rsync, Mirrorbits)        | TPA                           | high       |         |
 | [Weblate][]                                | Tails Team, Community Team    | high       |         |
-| Website (IkiWiki)                          | Tails Team                    | high       |         |
 
  [APT repository]: https://tails.net/contribute/APT_repository/custom/
  [APT snapshots]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index1h1
@@ -142,7 +142,8 @@ flowchart TD
       LimeSurvey>LimeSurvey] ~~~
       Bitcoin([Bitcoin]) ~~~
       git-annex([git-annex]) -->
-      Gitolite([Gitolite])
+      Gitolite([Gitolite]) ~~~
+      Website>Website]
       Mailman>Mailman lists] ~~~
       MTA>MTA] ~~~
       Registrars>Registrars] ~~~
@@ -184,7 +185,6 @@ flowchart TD
     subgraph Services
         WebServer>Web servers] ~~~
         Weblate{{Weblate}} ~~~
-        Website{{Website}}
         TorBridge([Tor Bridge]) ~~~
         TailsTeamGitLab([Tails Team GitLab]) ~~~
         MirrorPool{{Mirror pool}}
@@ -227,6 +227,7 @@ flowchart TD
     class BitTorrent keep
     class WhisperBack keep
     class AptSnapshots keep
+    class Website keep
 
     class Documentation merge
     class PasswordStore merge
@@ -290,6 +291,28 @@ release management, as well as data sources for the website.
 
 **Contraints:** None.
 
+## Website
+
+**Summary:** Lives in the main Tails repository and is built and deployed by
+the GitLab CI using a patched IkiWiki.
+
+**Action:** Keep:
+
+- Change deployment to the Tor's CDN
+- Retire the mirror VMs in Tails infra.
+- Postpone retirement of IkiWiki to a future discussion (see reference below)
+
+**Constraints:**
+
+- Blocks retirement of DNS
+- Requires po4a from Bullseye
+- Requires ikiwiki from https://deb.tails.boum.org (relates to the merge of the [APT repository][])
+
+**References:**
+
+- https://gitlab.tails.boum.org/tails/tails/-/issues/18721
+- https://gitlab.tails.boum.org/sysadmin-team/container-images/-/blob/main/ikiwiki/Containerfile
+
 # References
 
 See the [TPA/Tails sysadmins overview][] document that was used to inform the