diff --git a/.github/workflows/create-conda-envs.yml b/.github/workflows/create-conda-envs.yml
index 7bbe66a80b..2d8b4113c0 100644
--- a/.github/workflows/create-conda-envs.yml
+++ b/.github/workflows/create-conda-envs.yml
@@ -18,11 +18,14 @@ concurrency:
 
 jobs:
   test_conda_install:
+    # Workflow is currently broken
+    # https://github.com/cylc/cylc-doc/pull/788#issuecomment-2573610197
+    if: false
     runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9]
+        python: ['3.9']
     steps:
       - name: checkout cylc-doc
         uses: actions/checkout@v5
@@ -30,7 +33,7 @@ jobs:
       - name: configure python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: ${{ matrix.python }}
 
       - name: install setuptools
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cff6323129..fd7e70f855 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,9 @@ name: test
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
+      - '8.*.x'
   pull_request:
   workflow_dispatch:
     inputs:
diff --git a/src/installation.rst b/src/installation.rst
index 6d5fa5d6b2..027a934dbc 100644
--- a/src/installation.rst
+++ b/src/installation.rst
@@ -18,7 +18,7 @@ Via Conda (recommended)
 .. admonition:: Supported Python versions
 
    * cylc-flow supports Python 3.8+.
-   * cylc-uiserver currently only supports Python 3.8-3.9.
+   * cylc-uiserver supports Python 3.9+.
 
 .. tip::
 
@@ -49,7 +49,7 @@ Via Pip (+npm)
 .. admonition:: Supported Python versions
 
    * cylc-flow supports Python 3.7+.
-   * cylc-uiserver currently only supports Python 3.8-3.9.
+   * cylc-uiserver supports Python 3.9+.
 
 .. important::
 
diff --git a/src/reference/changes.rst b/src/reference/changes.rst
index 0d2edb18cc..bca648ceb6 100644
--- a/src/reference/changes.rst
+++ b/src/reference/changes.rst
@@ -22,9 +22,6 @@ For more detail see the component changelogs:
 
 ----------
 
-Cylc 8.5
---------
-
 .. TODO: Modify these URL's and uncomment this block before release
 
    .. admonition:: Cylc Components
@@ -36,6 +33,19 @@ Cylc 8.5
    :cylc-rose: `1.5 <https://github.com/cylc/cylc-rose/blob/master/CHANGES.md>`__
    :rose: `2.4 <https://github.com/metomi/rose/blob/master/CHANGES.md>`__
 
+
+Cylc 8.5
+--------
+
+.. admonition:: Cylc Components
+   :class: hint
+
+   :cylc-flow: `8.5 <https://github.com/cylc/cylc-flow/blob/master/CHANGES.md>`__
+   :cylc-ui: `2.8 <https://github.com/cylc/cylc-ui/blob/master/CHANGES.md>`__
+   :cylc-uiserver: `1.7 <https://github.com/cylc/cylc-uiserver/blob/master/CHANGES.md>`__
+   :cylc-rose: `1.6 <https://github.com/cylc/cylc-rose/blob/master/CHANGES.md>`__
+   :rose: `2.5 <https://github.com/metomi/rose/blob/master/CHANGES.md>`__
+
 More task information in the GUI (and Tui)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^