diff --git a/CHANGELOG.md b/CHANGELOG.md
index 650a94991..90eaf3d7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,39 +6,49 @@ Find changes for the upcoming release in the project's [changelog.d directory](h
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-8.2.0'></a>
+## 8.2.0 (2024-12-12)
+
+### New features
+
+- Add a `service` label to `GafaelfawrIngress` resources created for user file servers for proper Gafaelfawr metrics reporting.
+
+### Other changes
+
+- Change the base image for JupyterHub to `quay.io/jupyterhub/k8s-hub` from `jupyterhub/jupyterhub`. This means the JupyterHub image now uses Python 3.12.
+
 <a id='changelog-8.1.0'></a>
 ## 8.1.0 (2024-12-12)
 
 ### Bug fixes
 
-- Add page template override to hide useless-in-RSP Token link
+- Remove the `Token` link from the JupyterHub page template, since user tokens for JupyterHub are not supported on the Rubin Science Platform.
 
 ### Other changes
 
-- Update to JupyterHub 4.1.2 and z2jh Helm chart 4.0.0
+- Update to JupyterHub 5.2.1.
 
 <a id='changelog-8.0.3'></a>
 ## 8.0.3 (2024-11-18)
 
 ### Bug fixes
 
-- Make HTTP response body truncate at start rather than end in error message.
-
-- Wipe out xsrf token and cookies with each hub login in NubladoClient.
+- When reporting HTTP errors from the Nublado client, truncate the response body at the start rather than at the end. This makes it more likely that the error message from JupyterHub will appear in the truncated response.
+- Drop the XSRF token and cookies before performing a JupyterHub login in the Nublado client. The client previously hung on to the XSRF token indefinitely, which resulted in errors if the token was expired in JupyterHub, such as by user session expiration.
 
 <a id='changelog-8.0.2'></a>
 ## 8.0.2 (2024-10-31)
 
 ### Bug fixes
 
-- Correct broken formatting.
+- Fix broken formatting in error messages reported by the Nublado client.
 
 <a id='changelog-8.0.1'></a>
 ## 8.0.1 (2024-10-31)
 
 ### Bug fixes
 
-- Made Nublado client exception handling prettier and less leaky.
+- Improve error reporting of exceptions in the Nublado client and sanitize the reported body to remove some security tokens.
 
 <a id='changelog-8.0.0'></a>
 ## 8.0.0 (2024-10-22)
diff --git a/changelog.d/20241212_154123_rra_DM_48124a.md b/changelog.d/20241212_154123_rra_DM_48124a.md
deleted file mode 100644
index 37038e675..000000000
--- a/changelog.d/20241212_154123_rra_DM_48124a.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### New features
-
-- Add a `service` label to `GafaelfawrIngress` resources created for user file servers for proper Gafaelfawr metrics reporting.
diff --git a/changelog.d/20241212_162503_athornton_DM_48125.md b/changelog.d/20241212_162503_athornton_DM_48125.md
deleted file mode 100644
index fa0990715..000000000
--- a/changelog.d/20241212_162503_athornton_DM_48125.md
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Delete the sections that don't apply -->
-
-### Other changes
-
-- move to quay.io/jupyterhub/k8s-hub from docker.io/jupyterhub/jupyterhub for hub base image
-
-- rework CI to account for quay.io image requiring Python 3.12