diff --git a/tsa/policy/tpa-rfc-3-tools.mdwn b/tsa/policy/tpa-rfc-3-tools.mdwn
index e05d3ccf588ca2636848ed1a5f78c03cd71f786e..53c11528bc86bea116abe7537cdb89533f556135 100644
--- a/tsa/policy/tpa-rfc-3-tools.mdwn
+++ b/tsa/policy/tpa-rfc-3-tools.mdwn
@@ -36,7 +36,7 @@ established.
  1. version control: git, gitolite
  2. operating system: Debian packages (official, backports,
     third-party and TPA)
- 3. host installation: debootstrap, FAI, Fabric
+ 3. host installation: debootstrap, FAI
  4. ad-hoc tools: SSH, Cumin
  5. directory servers: OpenLDAP, BIND, ud-ldap, Hiera
  6. authentication servers: OpenLDAP, ud-ldap
@@ -54,7 +54,7 @@ established.
  17. Monitoring: syslog-ng central host, Nagios, Prometheus, Grafana,
      no paging
  18. password management: pwstore
- 19. help desk: Trac (deprecated), GitLab, RT, email, IRC
+ 19. help desk: Trac, email, IRC
  20. backup services: bacula, postgresql hot sync
  21. web services: Apache, Nginx, Varnish (deprecated), haproxy
      (deprecated)
@@ -69,8 +69,10 @@ established.
  1. figure out scope... list has grown big already
  2. are server specs part of this list?
  3. software raid?
- 4. add Gitlab issues, Gitlab wiki, Fabric, password-store...?
- 5. deprecate ntp in favor of openntpd?
+ 4. add Gitlab issues to help desk, deprecate Trac
+ 5. add Fabric to host installs and ad-hoc tools
+ 6. consider Gitlab wiki as a ikiwiki replacement?
+ 7. add RT to help desk?
 
 ## Examples