This will be announced separately, see base-images#24 for
followup.

policy/tpa-rfc-80-debian-trixie-upgrade-schedule.md

@@ -11,8 +11,8 @@ discussion: https://gitlab.torproject.org/tpo/tpa/team/-/issues/41990
 Summary: start upgrading servers during the Debian 13 ("trixie")
 freeze, if it goes well, complete most of the fleet upgrade in around
 June 2025, with full completion by the end of 2025, with a 2026 year
-free of major upgrades entirely. Improve automation, retire old
-container images.
+free of major upgrades entirely. Improve automation and cleanup old
+code.
 
 [[_TOC_]]
 
@@ -143,14 +143,17 @@ again.
 First, we tweak the installers to deploy Debian 13 by default to avoid
 installing further "old" systems. This includes the bare-metal
 installers but also and especially the virtual machine installers and
-container images.
+default container images.
 
-Concretely, we're planning on changing the `latest` container image
-tag to point to `trixie` in early April. A full *year* later, the
-`bookworm` container images will be retired. Note that we are already
-planning the retirement of the "old stable" (`bullseye`) container
-images, see [tpo/tpa/base-images#19][], for which you may have
-already been contacted.
+Concretely, we're planning on changing the `stable` container image
+tag to point to `trixie` in early April. We will be working on a
+*retirement* policy for container images later, as we do not want to
+bury that important (and new) policy here. For now, you should assume
+that bullseye images are going to go away soon
+([tpo/tpa/base-images#19][]), but a separate announcement will be
+issued for this ([tpo/tpa/base-images#24][]).
+
+ [tpo/tpa/base-images#24]: https://gitlab.torproject.org/tpo/tpa/base-images/-/issues/24
 
 New `idle` canary servers will be setup in Debian 13 to test
 integration with the rest of the infrastructure, and future new
@@ -404,7 +407,7 @@ this up, worst case in 2026.
   - W22 (last week of May): Batch 2 upgrades, TPA machines
   - W23 (first week of June): Batch 2 upgrades, Tails machines
 - 2025-Q3 to Q4: Batch 3 upgrades
-- 2026-Q2: bookworm container image retired
+- 2026+: cleanup
 
 ## Deadline