diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml
index 8c8afc2df4..6159ddc528 100644
--- a/.github/workflows/generate-docs.yml
+++ b/.github/workflows/generate-docs.yml
@@ -12,7 +12,7 @@ defaults:
 jobs:
   generate:
     if: github.repository == 'zeek/zeek'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
       # We only perform a push if the action was triggered via a schedule
@@ -60,7 +60,7 @@ jobs:
           sudo pip3 install -r doc/requirements.txt
 
       - name: Configure
-        run: ./configure
+        run: ./configure --disable-broker-tests --disable-cpp-tests
 
       - name: Build
         run: cd build && make -j $(nproc)
diff --git a/configure b/configure
index 80c009bc1a..0565fd1dff 100755
--- a/configure
+++ b/configure
@@ -442,6 +442,8 @@ echo "Build Directory : $builddir"
 echo "Source Directory: $sourcedir"
 cd $builddir
 
+echo "Using $(cmake --version | head -1)"
+echo
 if [ -n "$CMakeGenerator" ]; then
     "$CMakeCommand" -G "$CMakeGenerator" $CMakeCacheEntries $sourcedir
 else