diff --git a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
index 9a468b788fa93b705e14a2a8e1a98ae0358ea3b5..94f6cb071189648bba2d9e2119ff1df0f2f50364 100644
--- a/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
+++ b/policy/tpa-rfc-73-tails-infra-merge-roadmap.md
@@ -118,88 +118,91 @@ flowchart TD
     classDef retire fill:#f99,stroke:#f00,color:black;
     classDef keep fill:#9f9,stroke:#090,color:black;
     classDef merge fill:#adf,stroke:#00f,color:black;
+    classDef white fill:#fff,stroke:#000;
 
-    subgraph ColorCode [Color code]
-      style ColorCode fill:#fff,stroke:#fff;
-      Keep
-      class Keep keep
-      Merge
-      class Merge merge
-      Retire
-      class Retire retire
+    subgraph Captions
+      style Captions fill:#fff,stroke:#fff;
+      Keep; class Keep keep
+      Merge; class Merge merge
+      Retire; class Retire retire
       NeedDiscussion[Need discussion]
+
+      Low([Low complexity]); class Low white;
+      Medium>Medium complexity]; class Medium white;
+      High{{High complexity}}; class High white;
     end
 
     subgraph Independent [Independent from Puppet]
-      Documentation ~~~
-      PasswordStore[Password Store] ~~~
-      Schleuder ~~~
-      AptRepository[APT repository] ~~~
-      Colocations
-      LimeSurvey ~~~
-      Mailman[Mailman lists] ~~~
-      MTA ~~~
-      Registrars ~~~
-      SysadminsGitLab[Sysadmins GitLab] ~~~
-      SecurityPolicy[Security Policy]
-      Bitcoin ~~~
-      Calendar ~~~
-      MeetingReminder ~~~
-      XMPP -->
-      XmppBot[XMPP bot]
+      Documentation([Documentation]) ~~~
+      PasswordStore([Password Store]) ~~~
+      Schleuder([Schleuder]) ~~~
+      AptRepository>APT repository] ~~~
+      Colocations>Colocations]
+      LimeSurvey>LimeSurvey] ~~~
+      Mailman>Mailman lists] ~~~
+      MTA>MTA] ~~~
+      Registrars>Registrars] ~~~
+      SysadminsGitLab>Sysadmins GitLab] ~~~
+      SecurityPolicy{{Security Policy}}
+      Bitcoin([Bitcoin]) ~~~
+      Calendar([Calendar]) ~~~
+      MeetingReminder([Meeting reminder]) ~~~
+      XMPP>XMPP] -->
+      XmppBot([XMPP bot])
     end
 
     subgraph Puppet [Puppet repo and server]
     direction TB
-        Tor7[Upgrade Tor's Puppet Server to Puppet 7] --> PuppetModules & EYAML & CommitSigning
-        PuppetModules[Puppet modules] --> HybridPuppet
-        EYAML --> HybridPuppet
-        CommitSigning[Commit signing] --> HybridPuppet
-        HybridPuppet[Hybrid Puppet codebase]
+        Tor7>Upgrade Tor's Puppet Server to Puppet 7] --> PuppetModules & EYAML & CommitSigning
+        PuppetModules>Puppet modules] --> HybridPuppet
+        EYAML>EYAML] --> HybridPuppet
+        CommitSigning>Commit signing] --> HybridPuppet
+        HybridPuppet{{Hybrid Puppet codebase}}
     end
 
     subgraph Basic [Basic system functionality]
-        DNS
-        Backups --> Monitoring
-        TLS --> Monitoring
-        Firewall ~~~
-        Authentication
+        DNS{{DNS}}
+        Backups([Backups]) -->
+        Monitoring{{Monitoring}}
+        TLS([TLS]) --> Monitoring
+        Firewall{{Firewall}} ~~~
+        Authentication{{Authentication}}
     end
 
     subgraph ToKeep [Keep]
         direction TB;
-        HedgeDoc ~~~
-        IsoHistory[ISO history] ~~~
-        IpSpace[IP space] ~~~
-        TbArchive[Tor Browser archive] ~~~
-        BitTorrent ~~~
-        WhisperBack ~~~
-        AptSnapshots[APT snapshots]
+        HedgeDoc([HedgeDoc]) ~~~
+        IsoHistory([ISO history]) ~~~
+        IpSpace([IP space]) ~~~
+        TbArchive([Tor Browser archive]) ~~~
+        BitTorrent([BitTorrent]) ~~~
+        WhisperBack([WhisperBack]) ~~~
+        AptSnapshots{{APT snapshots}}
     end
 
     subgraph Services
-        WebServer[Web servers] ~~~
-        Weblate ~~~
-        TorBridge[Tor Bridge] ~~~
-        Website
-        TailsTeamGitLab[Tails Team GitLab] ~~~
-        MirrorPool[Mirror pool] ~~~
-        git-annex -->
-        Gitolite
-        Jenkins -->
-        VPN
+        WebServer>Web servers] ~~~
+        Weblate{{Weblate}} ~~~
+        TorBridge([Tor Bridge]) ~~~
+        Website{{Website}}
+        TailsTeamGitLab([Tails Team GitLab]) ~~~
+        MirrorPool{{Mirror pool}} ~~~
+        git-annex([git-annex]) -->
+        Gitolite([Gitolite])
+        Jenkins{{Jenkins}} -->
+        VPN{{VPN}}
     end
 
-    ColorCode ~~~ Puppet
-    ColorCode ~~~~ Independent
+    Captions ~~~ Puppet
+    Captions ~~~~ Independent
 
     Puppet --> ToKeep;
     Puppet --> Basic
 
     Basic --> Services
 
-    Services --> PuppetCodebase[Consolidated Puppet codebase]
-    Services --> Virtualization
+    Services --> PuppetCodebase{{Consolidated Puppet codebase}}
+    Services --> Virtualization([Virtualization])
 
     class DNS retire
     class Firewall retire