diff --git a/service.md b/service.md
index c8aebdb1ec37fcef37480557cc6e5c782357dfba..0de76182151cf26706f71fbd1b19825d84faa68a 100644
--- a/service.md
+++ b/service.md
@@ -85,7 +85,7 @@ The Service Admins maintain the following list of Tor Services.
 | [blog][]           | Weblog site                                           | <https://blog.torproject.org/>          | lavamind, gus               | 90%        | yes                           |
 | [bridgedb][]       | web app and email responder to learn bridge addresses | <https://bridges.torproject.org/>       | cohosh, meskio              | 20%        | no                            |
 | [bridgestrap][]    | service to tests bridges                              | `https://bridges.torproject.org/status` | cohosh, meskio              | 20%        | no                            |
-| [btcpayserver][]   | BTCpayserver                                          | <https://btcpay.torproject.org/>        | anarcat, sue                | 90%        | yes?                          |
+| [btcpayserver][]   | BTCpayserver                                          | <https://btcpay.torproject.org/>        | anarcat, sue                | 90%        | yes                           |
 | [check][]          | Web app to check if we're using tor                   | <https://check.torproject.org>          | arlolra                     | 90%        | LDAP                          |
 | [CRM][]            | Donation management                                   | `https://crm.torproject.org`            | openflows                   | 5%         | yes                           |
 | [collector][]      | Collects Tor network data and makes it available      | collector{1,2}.torproject.org           | irl                         | ?          | ?                             |
diff --git a/service/BTCpayserver.md b/service/BTCpayserver.md
index db0151c5887f236ee7f4282219c47d282bf417b4..1254ef710e7a8147fce6c6a9155334a7b23ed0c0 100644
--- a/service/BTCpayserver.md
+++ b/service/BTCpayserver.md
@@ -7,7 +7,8 @@ This page shouldn't be misconstrued as an approval of the use of the
 BTCpayserver project or, indeed, any cryptocurrency whatsoever. In
 fact, our experience with BTCpayserver makes us encourage you to look
 at alternatives instead, including not taking cryptocurrency payments
-at all.
+at all, see [TPA-RFC-25: BTCpayserver replacement](policy/tpa-rfc-25-btcpay-replacement) for that
+discussion.
 
 [[_TOC_]]
 
@@ -225,10 +226,9 @@ If the containers fail to start with this error:
     btcpayserver_1                       | fail: PayServer:      Error on the MigrationStartupTask
     btcpayserver_1                       | System.Net.Internals.SocketExceptionFactory+ExtendedSocketException (00000005, 0xFFFDFFFF): Name or service not known
 
-Take a look at disk space.
-
-We've had situations like this where the containers would fail with
-the above error when running out of disk space.
+Take a look at disk space. We've had situations like this where the
+containers would fail with the above error when running out of disk
+space.
 
 ### Stuck at "node is starting"
 
@@ -412,8 +412,8 @@ TODO: document how to hook into the hardware wallet, possibly see:
 https://docs.btcpayserver.org/ConnectWallet/
 
 Last time we followed this procedure, instead of hooking up the
-wallet, we tried to restore from backup. See [this comment and
-following](https://gitlab.torproject.org/tpo/tpa/team/-/issues/33750#note_2797196).
+wallet, we restored from backup. See [this comment and following](https://gitlab.torproject.org/tpo/tpa/team/-/issues/33750#note_2797196)
+and the [full migration procedure](#full-migration-procedure).
 
 ### Lunanode Deployment
 
@@ -422,13 +422,15 @@ TPA. This procedure was followed:
 
 - https://docs.btcpayserver.org/LunaNodeWebDeployment/
 
-Lunanode was chosen as a cheap and easy temporarily solution. Some
-doubts remain regarding how to make sure the machine and service are
-updated on a timely manner.
+Lunanode was chosen as a cheap and easy temporarily solution, but was
+eventually retired in favor of a normal TPA machines so that we would
+have it hooked in Puppet to have the normal system-level backups,
+monitoring, and so on.
 
 ## SLA
 
-TODO <!-- this describes an acceptable level of service for this service -->
+There is no official SLA for this service, but it should generally be
+up so that we can take donations.
 
 ## Design
 
@@ -599,14 +601,14 @@ they *eventually* answer (~24h latency last time).
 
 ## Monitoring and testing
 
-<!-- describe how this service is monitored and how it can be tested -->
-<!-- after major changes like IP address changes or upgrades. describe -->
-<!-- CI, test suites, linting, how security issues and upgrades are -->
-<!-- tracked -->
-
-TODO: how do we monitor payments work?
+There is no application-specific monitoring of this service. Users are
+expected to try to make a donation with Bitcoin (!) to see if payments
+go through. Money machine team is responsible for testing.
 
-TODO: how do we test BTC payments works?
+Rudimentary tests can be performed by going to the main domain website
+(<https://btcpay.torproject.org>) and logging in with the credentials
+from the TPA password manager. When someone does a payment, it should
+show up as an invoice.
 
 ## Logs and metrics