diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 68fa38d958f..88cd5fce124 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,7 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}/bld
       shell: bash
-      run: ninja -j 2
+      run: ninja -j 2 all documentation/package_html
 
     - name: Tests
       working-directory: ${{github.workspace}}/bld
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21989930c83..161569ea3a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,7 @@ list(GET FDB_VERSION_LIST 0 FDB_MAJOR)
 list(GET FDB_VERSION_LIST 1 FDB_MINOR)
 list(GET FDB_VERSION_LIST 2 FDB_PATCH)
 set(FDB_PACKAGE_NAME "${FDB_MAJOR}.${FDB_MINOR}")
-# configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_SOURCE_DIR}/versions.target)
+configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_CURRENT_BINARY_DIR}/versions.target)
 file(WRITE ${CMAKE_BINARY_DIR}/version.txt ${FDB_VERSION})
 
 message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}")
diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
index 7899af22618..23f998e28a8 100644
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -19,7 +19,8 @@ add_custom_command(OUTPUT ${venv_dir}/venv_setup
           ${CMAKE_COMMAND} -E copy ${sphinx_dir}/.pip.conf ${venv_dir}/pip.conf &&
           ${activate_script} &&
           ${python_command} -m pip install --upgrade pip &&
-          ${pip_command} install --upgrade -r ${sphinx_dir}/requirements.txt &&
+          ${pip_command} install --upgrade 'setuptools<=57.4.0,>=20.10.0' -v &&
+          ${pip_command} install --upgrade -r ${sphinx_dir}/requirements.txt -v &&
           ${pip_command} install sphinx-autobuild && # somehow this is missing in requirements.txt
           ${CMAKE_COMMAND} -E touch ${venv_dir}/venv_setup
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/documentation/sphinx/conf.py b/documentation/sphinx/conf.py
index cf500dbbc21..2f96f83947a 100644
--- a/documentation/sphinx/conf.py
+++ b/documentation/sphinx/conf.py
@@ -53,7 +53,7 @@
 
 # Load the version information from 'versions.target'
 import xml.etree.ElementTree as ET
-version_path = os.path.join(os.path.dirname(__file__), '..', '..', 'versions.target')
+version_path = os.path.join(os.path.dirname(sys.executable), '..', '..', '..', 'versions.target')
 tree = ET.parse(version_path)
 root = tree.getroot()
 
diff --git a/documentation/sphinx/requirements.txt b/documentation/sphinx/requirements.txt
index 67ca207628a..ae8cd4c4413 100644
--- a/documentation/sphinx/requirements.txt
+++ b/documentation/sphinx/requirements.txt
@@ -1,5 +1,5 @@
 --index-url https://pypi.python.org/simple
-setuptools>=20.10.0,<=57.4.0
 sphinx==1.5.6
 sphinx-bootstrap-theme==0.4.8
 docutils==0.16
+Jinja2==3.0.3