diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f840790..de36efe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,8 +41,8 @@ jobs:
           - "3.10"
           - "3.11"
           - "3.12"
-          - "pypy-3.8"
           - "pypy-3.9"
+          - "pypy-3.10"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 7c5cec7..86ce7bc 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -2,10 +2,14 @@
 version: 2
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
     # Keep in-sync with tox.ini/docs and ci.yml/docs
     python: "3.12"
+  jobs:
+    # Need the tags to calculate the version (sometimes).
+    post_checkout:
+      - git fetch --tags
 
 python:
   install: