diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index be346379..9e3efbf2 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -42,7 +42,7 @@ jobs:
 
   codeql:
     name: codeql
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 2dfb1200..279f4fd7 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -6,9 +6,9 @@ mkdocs:
   configuration: mkdocs.yml
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.11"
+    python: "3.12"
   commands:
     - pip install --user tox
     - TOX_EXTRA_BINDEP=0 python3 -m tox -e docs -- --strict --site-dir=_readthedocs/html/
diff --git a/docs/user-guide/ci-setup.md b/docs/user-guide/ci-setup.md
index aaee46db..ea0d42df 100644
--- a/docs/user-guide/ci-setup.md
+++ b/docs/user-guide/ci-setup.md
@@ -40,7 +40,7 @@ jobs:
       - integration
       - unit-galaxy
       - ansible-lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - run: >-
           python -c "assert 'failure' not in