diff --git a/roadmap/2021.md b/roadmap/2021.md
index e252c9cc4fce95fb9d8db2e5c2651a305a7b093d..e16a350aee913b1fab6dd1cb6a7a05cec149b12c 100644
--- a/roadmap/2021.md
+++ b/roadmap/2021.md
@@ -26,7 +26,7 @@ attention. In general, the over-arching goals are therefore:
  * [ ] ~~email delivery improvements~~: generally postponed to 2022,
        and needs better architecture. some work was still done.
    * [x] handle bounces in CiviCRM ([issue 33037](https://gitlab.torproject.org/tpo/tpa/team/-/issues/33037))
-   * [ ] systematically followup on and respond to abuse complaints (https://gitlab.torproject.org/tpo/tpa/team/-/issues/40168)
+   * [x] systematically followup on and respond to abuse complaints (https://gitlab.torproject.org/tpo/tpa/team/-/issues/40168)
    * [x] diagnose ~~and resolve~~ delivery issues (e.g. [Yahoo](https://gitlab.torproject.org/tpo/tpa/team/-/issues/34134),
          [state.gov](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40202), [Gmail](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40170), [Gmail again](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40149))
    * [ ] provide reliable delivery for users ("my email ends up in
@@ -47,13 +47,13 @@ attention. In general, the over-arching goals are therefore:
    * [ ] SVN ([issue 17202](https://gitlab.torproject.org/tpo/tpa/team/-/issues/17202))
    * [x] fpcentral ([issue 40009](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40009))
  * [ ] scale GitLab with ongoing and surely expanding usage
-   * [ ] possibly split in multiple server
+   * [ ] possibly split in multiple server ([#40479](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40479))
    * [x] throw more hardware at it: resized VM twice
    * [ ] monitoring?
  * [ ] provide reliable and simple continuous integration services
    * [ ] retire Jenkins (https://gitlab.torproject.org/tpo/tpa/team/-/issues/40218)
    * [ ] replace with GitLab CI, with Windows, Mac and Linux runners
-   * [ ] deployed more runners, some with very specific docker configurations
+   * [x] deployed more runners, some with very specific docker configurations
  * [ ] [fix the blog formatting and comment moderation](https://gitlab.torproject.org/tpo/web/blog-trac/-/issues/33115), possible solutions:
    * [ ] migrate to a static website and Discourse  https://gitlab.torproject.org/tpo/tpa/team/-/issues/40183 https://gitlab.torproject.org/tpo/tpa/team/-/issues/40297
  * [ ] improve communications and monitoring:
@@ -75,7 +75,7 @@ attention. In general, the over-arching goals are therefore:
 ## Nice to have
 
  * [ ] improve sysadmin code base
-   * [ ] implement an ENC for Puppet ([issue 40358](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40358))
+   * [x] implement an ENC for Puppet ([issue 40358](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40358))
    * [ ] avoid YOLO commits in Puppet (possibly: server-side linting, CI)
    * [ ] publish our Puppet repository ([ticket 29387](https://gitlab.torproject.org/tpo/tpa/team/-/issues/29387))
    * [ ] reduce dependency on Python 2 code (see [short term LDAP plan](https://gitlab.torproject.org/tpo/tpa/team/-/wikis/howto/ldap#short-term-merge-with-upstream-port-to-python-3-if-necessary))
@@ -204,7 +204,7 @@ but it should still be an interesting exercise to perform.
  * [ ] SVN retirement plan ([issue 17202](https://gitlab.torproject.org/tpo/tpa/team/-/issues/17202))
  * [x] fpcentral retirement ([issue 40009](https://gitlab.torproject.org/tpo/tpa/team/-/issues/40009))
  * [x] ~~redo the user survey and 2022 roadmap~~ abandoned (https://gitlab.torproject.org/tpo/tpa/team/-/issues/40307)
- * [ ] ~~BTCpayserver hosting
+ * [x] ~~BTCpayserver hosting
        (https://gitlab.torproject.org/tpo/tpa/team/-/issues/33750)~~
        pay for BTCpayserver hosting (tpo/tpa/team#40303)
  * [ ] move root@ and tpa "noise" to RT (tpo/tpa/team#31242), make a real mailing list for admins so that gaba and non-tech can join