diff --git a/.gitmodules b/.gitmodules
index 6333c7e38256c4ac29bb12cb33e6a56f532759e8..9b6b544e3178d0d8f03c6a76bac7fa4d74837478 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "ThirdParty/ogs6py"]
 	path = ThirdParty/ogs6py
 	url = https://github.com/joergbuchwald/ogs6py.git
+[submodule "ThirdParty/bilke/cmake-modules"]
+	path = ThirdParty/bilke/cmake-modules
+	url = https://github.com/bilke/cmake-modules.git
diff --git a/MaterialLib/CMakeLists.txt b/MaterialLib/CMakeLists.txt
index 168f5af3ff0e1880634d70ad192ae184de8b9e2d..ad05d8efe5427134edb4f051955b799ff9074420 100644
--- a/MaterialLib/CMakeLists.txt
+++ b/MaterialLib/CMakeLists.txt
@@ -39,12 +39,17 @@ append_source_files(
 ogs_add_library(MaterialLib GENERATE_EXPORT_HEADER ${SOURCES})
 
 target_link_libraries(
-    MaterialLib
-    PUBLIC BaseLib Eigen3::Eigen MaterialLib_SolidModels
-           MaterialLib_FractureModels
-    PRIVATE MathLib MeshLib ParameterLib exprtk Boost::mp11
+    MaterialLib PUBLIC BaseLib Eigen3::Eigen MaterialLib_SolidModels
+                       MaterialLib_FractureModels
+    PRIVATE MathLib MeshLib ParameterLib exprtk Boost::boost
 )
 
-target_precompile_headers(MaterialLib PRIVATE [["BaseLib/Error.h"]]
-    [["BaseLib/ConfigTree.h"]] [["BaseLib/Logging.h"]]
-    [["ParameterLib/Parameter.h"]] <Eigen/Core>)
+target_precompile_headers(
+    MaterialLib
+    PRIVATE
+    [["BaseLib/Error.h"]]
+    [["BaseLib/ConfigTree.h"]]
+    [["BaseLib/Logging.h"]]
+    [["ParameterLib/Parameter.h"]]
+    <Eigen/Core>
+)
diff --git a/MaterialLib/SolidModels/MFront/CMakeLists.txt b/MaterialLib/SolidModels/MFront/CMakeLists.txt
index 2ad702b5c69769398801c0f3eb453fdc21b9254e..2a771cf3f8f4f3915c161667b63d32c0ff60bda3 100644
--- a/MaterialLib/SolidModels/MFront/CMakeLists.txt
+++ b/MaterialLib/SolidModels/MFront/CMakeLists.txt
@@ -1,8 +1,12 @@
 set(SOURCES
-    CreateMFront.cpp CreateMFront.h
-    MFront.cpp MFront.h
-    MFrontGeneric.cpp MFrontGeneric.h
-    CreateMFrontGeneric.cpp CreateMFrontGeneric.h
+    CreateMFront.cpp
+    CreateMFront.h
+    MFront.cpp
+    MFront.h
+    MFrontGeneric.cpp
+    MFrontGeneric.h
+    CreateMFrontGeneric.cpp
+    CreateMFrontGeneric.h
 )
 
 ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES})
@@ -28,8 +32,7 @@ mfront_behaviours_check_library(
 
 target_link_libraries(
     MaterialLib_SolidModels_MFront PUBLIC BaseLib NumLib MFrontGenericInterface
-                                          OgsMFrontBehaviour
-                                          Boost::mp11
+                                          OgsMFrontBehaviour Boost::boost
     PRIVATE MathLib MeshLib ParameterLib
 )
 
diff --git a/NumLib/CMakeLists.txt b/NumLib/CMakeLists.txt
index e516506e3d333cf878cb0d1172db0598040e7332..4ecd2f62b6558106fab1e84282c123757f8a1c76 100644
--- a/NumLib/CMakeLists.txt
+++ b/NumLib/CMakeLists.txt
@@ -19,9 +19,11 @@ ogs_add_library(NumLib GENERATE_EXPORT_HEADER ${SOURCES})
 set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
 
 target_link_libraries(
-    NumLib PUBLIC BaseLib GeoLib MathLib MeshLib $<$<TARGET_EXISTS:petsc>:petsc> Boost::mp11
-    PRIVATE MeshGeoToolsLib
+    NumLib PUBLIC BaseLib GeoLib MathLib MeshLib $<$<TARGET_EXISTS:petsc>:petsc>
+                  Boost::boost PRIVATE MeshGeoToolsLib
 )
 
-target_precompile_headers(NumLib PRIVATE [["BaseLib/Error.h"]]
-    [["BaseLib/ConfigTree.h"]] [["BaseLib/Logging.h"]] <Eigen/Core>)
+target_precompile_headers(
+    NumLib PRIVATE [["BaseLib/Error.h"]] [["BaseLib/ConfigTree.h"]]
+    [["BaseLib/Logging.h"]] <Eigen/Core>
+)
diff --git a/ProcessLib/CMakeLists.txt b/ProcessLib/CMakeLists.txt
index 976fb16bd7aadacf8f1975f6bc1dfad9bb2c4517..6a3816f967c5585a3f453b82f2b3282bcfa62804 100644
--- a/ProcessLib/CMakeLists.txt
+++ b/ProcessLib/CMakeLists.txt
@@ -31,7 +31,7 @@ target_link_libraries(
         MeshGeoToolsLib
         MeshLib
         NumLib
-        Boost::mp11
+        Boost::boost
         range-v3
         $<$<TARGET_EXISTS:ProcessLibBoundaryConditionAndSourceTermPython>:ProcessLibBoundaryConditionAndSourceTermPython>
         $<$<TARGET_EXISTS:petsc>:petsc>
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dfefdfe5c300100e24ffb46022ab2f10b5fce04f..3205ee04c807a5701ec0ab2cca9bd5a77d2f03a7 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -101,7 +101,8 @@ target_link_libraries(
             TestInfoLib
             VTK::FiltersGeneral
             VTK::FiltersSources
-            Boost::mp11 # TODO move OGSMFrontThermodynamicForcesView to MathLib?
+            Boost::boost # TODO move OGSMFrontThermodynamicForcesView to
+                         # MathLib?
             $<$<TARGET_EXISTS:Threads::Threads>:Threads::Threads>
             $<$<TARGET_EXISTS:LIE>:LIE>
             $<$<TARGET_EXISTS:TH2M>:TH2M>
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index cbb7e65c720d9a1beff01cde326c16031d47ebaf..20a16fa2fc14dbf81d920c49b5a1e9697416f64d 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -129,7 +129,7 @@ endif()
 CPMFindPackage(
     NAME Boost
     VERSION ${ogs.minimum_version.boost}
-    URL https://gitlab.opengeosys.org/ogs/libs/boost-subset/-/jobs/187805/artifacts/raw/ogs-boost-${ogs.minimum_version.boost}.tar.gz
+    URL https://gitlab.opengeosys.org/ogs/libs/boost-subset/-/jobs/303158/artifacts/raw/ogs-boost-${ogs.minimum_version.boost}.tar.gz
 )
 if(Boost_ADDED)
     add_library(Boost::boost INTERFACE IMPORTED)
@@ -277,13 +277,6 @@ CPMAddPackage(
     EXCLUDE_FROM_ALL YES
 )
 
-CPMFindPackage(
-    NAME boost_mp11
-    VERSION 1.79.0
-    GITHUB_REPOSITORY boostorg/mp11
-    GIT_TAG boost-1.79.0
-)
-
 if(OGS_BUILD_TESTING OR OGS_BUILD_UTILS)
     CPMAddPackage(
         NAME vtkdiff GITHUB_REPOSITORY ufz/vtkdiff
diff --git a/web/data/versions.json b/web/data/versions.json
index 526cbec128ede001f7ccb3d9a89d58878c5818b2..0c459d0c234b611072bb6c8113096623799ca60d 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -13,7 +13,7 @@
     "git": "2.14",
     "cmake": "3.22",
     "hugo": "0.64.1",
-    "boost": "1.69.0",
+    "boost": "1.73.0",
     "eigen": "9441d94dccccd5db8d64179516fdc5b53994a047",
     "vtk": "9.1.0",
     "petsc": "3.16.3",
@@ -68,8 +68,8 @@
     }
   },
   "cpm": {
-    "package_file_id": 372,
-    "package_file_sha256": "cdd10361ac3a708959df5b50946df1bd4295dac2bc45980e0eb11ceccfb9c674"
+    "package_file_id": 408,
+    "package_file_sha256": "1adbe86dbc48a51bd2ff80a23e4729571bc338a5a76a8fb5acb3fc6d253e80f5"
   },
   "ext": {
     "cache_hash": "4ebd62e0ce484732dbf3cd9932f60b67762e156b"