diff --git a/howto/puppet.md b/howto/puppet.md
index ce398d2493f599b04cc59f0c04f38f66f1b83d6f..7603b63ee9d03337579d1e27dc0f85e8450ccde2 100644
--- a/howto/puppet.md
+++ b/howto/puppet.md
@@ -1758,10 +1758,10 @@ TL;DR:
  2. Get rid of `3rdparty`
  3. Deploy with `g10k`
  4. Authenticate with checksums
- 5. Deploy to branch-specific environments
+ 5. Deploy to branch-specific environments (tpo/tpa/team#40861)
  6. Rename the default branch "production"
  7. Push directly on the Puppet server
- 8. Use a role account
+ 8. Use a role account (tpo/tpa/team#29663)
  9. Use local test environments
  10. Develop a test suite
  11. Hook into CI
@@ -1944,6 +1944,8 @@ of deploying code to new environments depending on the branch we're
 working on. We would enable that feature to allow testing some large
 changes to critical code paths without affecting all servers.
 
+See tpo/tpa/team#40861.
+
 ### Rename the default branch "production"
 
 In accordance with Puppet's best practices, the control repository's