... that's as much i could do in a reasonable amount of time, but
there's a lot of references to it everywhere. There's certainly still
stuff referencing git.tpo as well.

service/ci.md

@@ -2,8 +2,12 @@
 and packages to be built, automatically, when new code is pushed to
 the version control system (currently [git](howto/git)).
 
-Note that even though the current system is [Jenkins][], this page mostly documents GitLab
-CI as that will be the likely, long term replacement.
+Note that the CI system is implemented with [GitLab](howto/gitlab),
+which has its own documentation. This page, however, documents the
+GitLab CI things specific to TPA.
+
+This service was setup as a replacement to the previous CI system,
+[Jenkins][], which has its own documentation, for historical purposes.
 
 [Jenkins]: service/jenkins
 
@@ -294,10 +298,9 @@ not be fully available.
 
 ## Design
 
-The CI service is currently being serviced by [Jenkins][], but we are
-looking at replacing this with GitLab CI in the [2021
-roadmap](roadmap/2021). This section therefore mostly documents how the new
-GitLab CI service is built. See [Jenkins section](#jenkins) below for more
+The CI service was served by [Jenkins][] until the end of the [2021
+roadmap](roadmap/2021). This section documents how the new GitLab CI
+service is built. See [Jenkins section](#jenkins) below for more
 information about the old Jenkins service.
 
 ### GitLab CI architecture
@@ -534,9 +537,10 @@ should be rebuilt from scratch, as per [disaster recover](#disaster-recovery).
 
 # Discussion
 
-Tor currently uses [Jenkins][] to run tests, builds and various
-automated jobs. This discussion is about if and how to replace this
-with GitLab CI.
+Tor currently previously used [Jenkins][] to run tests, builds and
+various automated jobs. This discussion was about if and how to
+replace this with GitLab CI. This was done and GitLab CI is now the
+preferred CI tool.
 
 ## Overview
 
@@ -568,6 +572,7 @@ which was formally proposed in [TPA-RFC-8][].
 
 [issue 40095]: https://gitlab.torproject.org/tpo/tpa/team/-/issues/40095
 [TPA-RFC-8]: policy/tpa-rfc-8-gitlab-ci-libvirt
+
 ## Goals
 
 In general, the idea here is to evaluate GitLab CI as a unified