diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 515fea1992..8e1219a50f 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -17,7 +17,7 @@ jobs:
     permissions:
       contents: write  # for Git to git push
     if: github.repository == 'zeek/zeek'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       # We only perform a push if the action was triggered via a schedule
diff --git a/CHANGES b/CHANGES
index 906247820a..b07d9fb942 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+6.0.8-1 | 2024-10-18 17:17:27 -0700
+
+  * Merge remote-tracking branch 'origin/topic/bbannier/fix-docs-ci-again' (Christian Kreibich, Corelight)
+
+    * origin/topic/bbannier/fix-docs-ci-again:
+      Fix installation of Python packages in generate docs CI job again
+
+    (cherry picked from commit c28442a9a178b735e3fe1b5f5938f922a5aa7a66)
+
 6.0.8 | 2024-10-04 14:50:18 -0700
 
   * Update CHANGES, VERSION, and NEWS for 6.0.8 release (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index 4b786f5755..c37b2caf5c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.8
+6.0.8-1