diff --git a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
index b6079b4935bd936612a9535edf51c5632b24cd45..1e8d5cf90fd706a7e9b2de8bba92e593ba0de0e8 100644
--- a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
+++ b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
@@ -12,42 +12,102 @@ discussion:
 
 Summary: Tails infra merge roadmap.
 
-# Background
-
 # Proposal
 
-## Goals
-
-<!-- include bugs to be fixed -->
-
-### Must have
-
-### Nice to have
-
-### Non-Goals
-
-## Tasks
-
-## Scope
-
-## Affected users
-
-### Personas impact
-
-## Timeline
-
-## Costs estimates
-
-### Hardware
-
-### Staff
-
-# Alternatives considered
+## Services overview
+
+### Keep
+
+| item                                       | stakeholders                  | complexity |
+| ------------------------------------------ | ----------------------------- | ---------- |
+| HedgeDoc                                   | Tails Team                    | low        |
+| ISO history ([git-annex][])                | Tails Team                    | low        |
+| IP space                                   | TPA                           | low        |
+| Tor Browser archive ([git-annex][])        | Tails Team                    | low        |
+| [BitTorrent][] (Transmission)              | Tails Team                    | low        |
+| [Whisperback][] (postfix, onion)           | Tails Team                    | low        |
+| APT snapshots ([time-based][], [tagged][]) | Tails Team                    | high       |
+
+### Merge
+
+| item                                       | stakeholders                  | complexity |
+| ------------------------------------------ | ----------------------------- | ---------- |
+| Documentation                              | TPA                           | low        |
+| Password Store                             | TPA                           | low        |
+| [Schleuder][]                              | Tails Team, Community Council | low        |
+| Sysadmins documentation                    | TPA                           | low        |
+| [APT repository][] (reprepro)              | Tails Team                    | medium     |
+| [Backups][]                                | TPA                           | medium     |
+| Colocations                                | TPA                           | medium     |
+| [LimeSurvey][]                             | UX Team                       | medium     |
+| Mailman lists at autistici                 | Tails Team, Community Team    | medium     |
+| [MTA][] (postfix)                          | TPA                           | medium     |
+| Registrars                                 | TPA                           | medium     |
+| Sysadmins GitLab                           | TPA, Tails Team               | medium     |
+| Puppet                                     | TPA                           | high       |
+| [Sysadmins Security Policy][]              | TPA                           | high       |
+| [Weblate][]                                | Tails Team, Community Team    | high       |
+
+### Retire
+
+| item                                       | stakeholders                  | complexity |
+| ------------------------------------------ | ----------------------------- | ---------- |
+| [Bitcoin][]                                | Finances                      | low        |
+| Calendar                                   | TPA, Tails Team               | low        |
+| [Meeting reminder][]                       | Tails Team                    | low        |
+| TLS ([tails::profile::letsencrypt])        | TPA                           | medium     |
+| Authentication ([puppet-rbac])             | TPA                           | high       |
+| Firewall ([puppet-tirewall]                | TPA                           | high       |
+| [DNS][] (PowerDNS)                         | TPA                           | high       |
+| Monitoring ([Icinga2][])                   | TPA                           | high       |
+| [Tinc][]                                   | TPA                           | high       |
+
+### Need discussion
+
+| item                                       | stakeholders                  | complexity |
+| ------------------------------------------ | ----------------------------- | ---------- |
+| [git-annex][]                              | Tails Team                    | low        |
+| [Tor Bridge][]                             | Tails Team                    | low        |
+| XMPP Bot                                   | Tails Team                    | low        |
+| [Gitolite][]                               | TPA, Tails Team               | medium     |
+| Tails Team GitLab                          | Tails Team                    | medium     |
+| Virtualization                             | TPA                           | medium     |
+| Web servers                                | TPA                           | medium     |
+| Instant messaging (XMPP)                   | Tails Team                    | medium     |
+| [Jenkins][]                                | Tails Team                    | high       |
+| [Mirror pool][] (Rsync, Mirrorbits)        | TPA                           | 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
+ [Backups]: https://gitlab.torproject.org/tpo/tpa/team/-/issues/41805
+ [Bitcoin]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index2h1
+ [DNS]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index4h1
+ [Firewall]: https://gitlab.tails.boum.org/tails/puppet-tirewall
+ [Gitolite]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index6h1
+ [git-annex]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index7h1
+ [Icinga2]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index8h1
+ [ISO history]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index7h1 
+ [Jenkins]: https://gitlab.tails.boum.org/tails/tails/-/issues/18999
+ [LimeSurvey]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index10h1
+ [MTA]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index10h1
+ [Meeting reminder]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index12h1
+ [Mirror pool]: https://tails.net/contribute/design/mirrors/
+ [Schleuder]: https://tails.net/contribute/working_together/roles/sysadmins/services/#schleuder
+ [Sysadmin Security Policy]: tpo/tpa/team#41727
+ [tagged]: https://tails.net/contribute/APT_repository/tagged_snapshots/
+ [TLS]: https://gitlab.tails.boum.org/tails/puppet-tails/-/blob/master/manifests/profile/letsencrypt.pp
+ [time-based]: https://tails.net/contribute/APT_repository/time-based_snapshots/
+ [Tinc]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index17h1
+ [Tor Bridge]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index16h1
+ [BitTorrent]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index3h1
+ [Weblate]: https://tails.net/contribute/design/translation_platform/
+ [Whisperback]: https://tails.net/contribute/working_together/roles/sysadmins/services/#index20h1
+ [puppet-rbac]: https://gitlab.tails.boum.org/tails/puppet-rbac
 
 # References
 
-See the [TPA/Tails sysadmins
-overview](/tpo/tpa/team/-/wikis/roadmap/tails-merge) document, prepared to
-inform the decision about the merge.
+See the [TPA/Tails sysadmins overview][] document that was used to inform the
+decision about the merger.
 
-## Personas description
+ [TPA/Tails sysadmins overview]: https://gitlab.torproject.org/tpo/tpa/team/-/wikis/roadmap/tails-merge