diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index cebf249d996d322638bf444d2b642c3abe7bd87e..2a8bc9d03e310b734973bd266155172a464f06b3 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -13,12 +13,15 @@ build container images:
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
     - poetry run ogscm compiler.py ogs.py --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr --mfront --ccache
+      --version_file ../../web/data/versions.json
       --tag $CONTAINER_GCC_IMAGE --upload
     - poetry run ogscm compiler.py ogs.py --build --ogs off
       --pm system --cvode --cppcheck --docs --gcovr --gui --ccache
+      --version_file ../../web/data/versions.json
       --tag $CONTAINER_GCC_GUI_IMAGE --upload
     - poetry run ogscm compiler.py ogs.py --build --ogs off
       --compiler clang --compiler_version 9 --ccache
+      --version_file ../../web/data/versions.json
       --tag $CONTAINER_CLANG_IMAGE --upload
 
 ### global project images ###
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index dff353566d1163e7be529c9a800eb5c730f6263c..e4a64b8a09aa3f67fc47020783def34a3ebce341 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -115,11 +115,16 @@ if(OGS_USE_MFRONT)
     endif()
 endif()
 
+string(REPLACE "." "_" BOOST_VERSION_UNDESCORE ${ogs.minimum_version.boost})
 CPMFindPackage(
     NAME Boost
-    GITHUB_REPOSITORY Orphis/boost-cmake
     VERSION ${ogs.minimum_version.boost}
+    URL https://dl.bintray.com/boostorg/release/${ogs.minimum_version.boost}/source/boost_${BOOST_VERSION_UNDESCORE}.tar.gz
 )
+if(Boost_ADDED)
+    add_library(Boost::boost INTERFACE IMPORTED)
+    target_include_directories(Boost::boost INTERFACE "${Boost_SOURCE_DIR}")
+endif()
 
 if(OGS_USE_XDMF)
     # ZLIB is a HDF5 dependency
diff --git a/web/data/versions.json b/web/data/versions.json
index f7ee6890729bb0b818d3ea253b9d3d192d331b71..dde12df8ea81025f3523aae31d7be7f3d4f87cc1 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -13,7 +13,7 @@
     "git": "2.14",
     "cmake": "3.14",
     "hugo": "0.64.1",
-    "boost": "1.67.0",
+    "boost": "1.69.0",
     "eigen": "3.3.9",
     "vtk": "8.2.0",
     "petsc": "3.11.2",