diff --git a/.guix/modules/ogs-package.scm b/.guix/modules/ogs-package.scm
index 62e5bf93c48..197ab846af3 100644
--- a/.guix/modules/ogs-package.scm
+++ b/.guix/modules/ogs-package.scm
@@ -70,7 +70,6 @@
        #:cmake ,cmake)) ;for newer CMake version
     (inputs (list boost
                   eigen
-                  fmt
                   googletest
                   hdf5
                   json-modern-cxx
diff --git a/Applications/Utils/MeshEdit/checkMesh.cpp b/Applications/Utils/MeshEdit/checkMesh.cpp
index c5405ebdec2..db2e7b28f2f 100644
--- a/Applications/Utils/MeshEdit/checkMesh.cpp
+++ b/Applications/Utils/MeshEdit/checkMesh.cpp
@@ -13,7 +13,7 @@
 #include <mpi.h>
 #endif
 
-#include <fmt/ranges.h>
+#include <spdlog/fmt/bundled/ranges.h>
 
 #include <array>
 #include <string>
diff --git a/BaseLib/FileTools.cpp b/BaseLib/FileTools.cpp
index e5145ffc74f..f00f5988937 100644
--- a/BaseLib/FileTools.cpp
+++ b/BaseLib/FileTools.cpp
@@ -14,7 +14,7 @@
 
 #include "FileTools.h"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <filesystem>
diff --git a/BaseLib/PrjProcessing.cpp b/BaseLib/PrjProcessing.cpp
index 5a0d898dca3..3fa4f66c641 100644
--- a/BaseLib/PrjProcessing.cpp
+++ b/BaseLib/PrjProcessing.cpp
@@ -10,10 +10,10 @@
 
 #include "PrjProcessing.h"
 
-#include <fmt/core.h>
 #include <libxml/globals.h>
 #include <libxml/parser.h>
 #include <libxml/xmlstring.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <xml_patch.h>
 
 #include <filesystem>
diff --git a/GeoLib/AABB.h b/GeoLib/AABB.h
index 3a05f55a50b..2ea2d00be31 100644
--- a/GeoLib/AABB.h
+++ b/GeoLib/AABB.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <fmt/ostream.h>
+#include <spdlog/fmt/bundled/ostream.h>
 
 #include <Eigen/Core>
 #include <bitset>
diff --git a/GeoLib/CMakeLists.txt b/GeoLib/CMakeLists.txt
index 153810e21b4..a75c3e83b38 100644
--- a/GeoLib/CMakeLists.txt
+++ b/GeoLib/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(
     PUBLIC BaseLib Eigen3::Eigen MathLib $<$<BOOL:${OGS_BUILD_GUI}>:rapidxml>
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
-           fmt::fmt-header-only
+           spdlog::spdlog
     PRIVATE range-v3 tet
 )
 
diff --git a/MaterialLib/SolidModels/SelectSolidConstitutiveRelation.h b/MaterialLib/SolidModels/SelectSolidConstitutiveRelation.h
index d909481a864..a41192168bb 100644
--- a/MaterialLib/SolidModels/SelectSolidConstitutiveRelation.h
+++ b/MaterialLib/SolidModels/SelectSolidConstitutiveRelation.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <fmt/ranges.h>
+#include <spdlog/fmt/bundled/ranges.h>
 
 #include <map>
 #include <range/v3/view/map.hpp>
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index d184bfca005..1ec14a85f86 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(
            $<$<BOOL:${OGS_USE_PETSC}>:petsc>
            Eigen3::Eigen
            $<$<TARGET_EXISTS:OpenMP::OpenMP_CXX>:OpenMP::OpenMP_CXX>
-           fmt::fmt-header-only
+           spdlog::spdlog
 )
 
 if(OGS_USE_LIS)
diff --git a/MathLib/FormattingUtils.h b/MathLib/FormattingUtils.h
index 54996fe363a..1ee97ddc2ff 100644
--- a/MathLib/FormattingUtils.h
+++ b/MathLib/FormattingUtils.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <fmt/ostream.h>
+#include <spdlog/fmt/bundled/ostream.h>
 
 #include <Eigen/Core>
 #include <concepts>
diff --git a/MeshToolsLib/CMakeLists.txt b/MeshToolsLib/CMakeLists.txt
index 60cf1669486..dd60ad02704 100644
--- a/MeshToolsLib/CMakeLists.txt
+++ b/MeshToolsLib/CMakeLists.txt
@@ -9,7 +9,8 @@ append_source_files(SOURCES MeshQuality)
 ogs_add_library(MeshToolsLib ${SOURCES})
 
 target_link_libraries(
-    MeshToolsLib PUBLIC MeshLib
+    MeshToolsLib PUBLIC GeoLib
+                        MeshLib
                         range-v3
                         VTK::IOXML
                         VTK::IOLegacy
diff --git a/NumLib/ODESolver/PETScNonlinearSolver.cpp b/NumLib/ODESolver/PETScNonlinearSolver.cpp
index 91dc37f2161..cd137f357f1 100644
--- a/NumLib/ODESolver/PETScNonlinearSolver.cpp
+++ b/NumLib/ODESolver/PETScNonlinearSolver.cpp
@@ -12,9 +12,9 @@
 
 #include "PETScNonlinearSolver.h"
 
-#include <fmt/core.h>
 #include <petscmat.h>
 #include <petscvec.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include "BaseLib/RunTime.h"
 
diff --git a/ProcessLib/Assembly/MatrixOutput.cpp b/ProcessLib/Assembly/MatrixOutput.cpp
index ca1004899f1..5eaa76d2a2c 100644
--- a/ProcessLib/Assembly/MatrixOutput.cpp
+++ b/ProcessLib/Assembly/MatrixOutput.cpp
@@ -10,7 +10,7 @@
 
 #include "MatrixOutput.h"
 
-#include <fmt/ostream.h>
+#include <spdlog/fmt/bundled/ostream.h>
 
 #include <optional>
 #include <unordered_set>
diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
index fca55c74931..8d371f6a024 100644
--- a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
+++ b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 
 #include <Eigen/LU>
 #include <cassert>
diff --git a/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp b/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp
index 3d62c2f0b09..76e961ecc55 100644
--- a/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp
+++ b/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp
@@ -9,9 +9,9 @@
 
 #ifdef OGS_USE_MFRONT
 
-#include <fmt/format.h>
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
+#include <spdlog/fmt/bundled/format.h>
 
 #include "BaseLib/ConfigTree.h"
 #include "MaterialLib/SolidModels/MFront/CreateMFrontGeneric.h"
diff --git a/ThirdParty/collection b/ThirdParty/collection
index d57a65125b9..c0f03942707 160000
--- a/ThirdParty/collection
+++ b/ThirdParty/collection
@@ -1 +1 @@
-Subproject commit d57a65125b9693556de26e1c47d8da7c5d3e776c
+Subproject commit c0f03942707bba49aaef1d1dd150852ff30ecead
diff --git a/scripts/cmake/CheckHeaderCompilation.cmake b/scripts/cmake/CheckHeaderCompilation.cmake
index fd8adb5cacd..05bdeec7106 100644
--- a/scripts/cmake/CheckHeaderCompilation.cmake
+++ b/scripts/cmake/CheckHeaderCompilation.cmake
@@ -39,13 +39,12 @@ function(_check_header_compilation target)
     foreach(
         lib
         ${LINK_LIBS}
-        spdlog
+        spdlog::spdlog
         Boost::boost
         Eigen3::Eigen
         nlohmann_json::nlohmann_json
         range-v3
         # petsc; is given via ${PETSC_INCLUDES} below.
-        fmt::fmt-header-only
     )
         # Ignore non-existing targets or interface libs
         if(NOT TARGET ${lib})
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index 13081c36390..f83458804f8 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -67,7 +67,9 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
         endif()
         add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fext-numeric-literals>)
         include(GCCSanitizer)
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13.1.1)
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13.1.1
+           OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13.2.1
+        )
             # See https://gitlab.opengeosys.org/ogs/ogs/-/merge_requests/4597
             add_compile_options(
                 $<$<COMPILE_LANGUAGE:CXX>:-Wno-dangling-reference>
@@ -76,14 +78,6 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
                 $<$<COMPILE_LANGUAGE:CXX>:-Wno-stringop-overread>
             )
         endif()
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13.2.1)
-            # A smaller set than that for 13.1.1
-            add_compile_options(
-                $<$<COMPILE_LANGUAGE:CXX>:-Wno-dangling-reference>
-                $<$<COMPILE_LANGUAGE:CXX>:-Wno-array-bounds>
-                $<$<COMPILE_LANGUAGE:CXX>:-Wno-stringop-overread>
-            )
-        endif()
     endif()
 
     if(COMPILER_IS_CLANG)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index e7726529879..a9c2487e8c1 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -31,28 +31,14 @@ if(OGS_BUILD_TESTING)
     endif()
 endif()
 
-# Check spdlog release for compatible fmt release. fmt may be provided by vtk
-# _ext build.
-if(NOT TARGET fmt::fmt-header-only)
-    CPMFindPackage(
-        NAME fmt
-        GIT_TAG 10.1.0
-        GITHUB_REPOSITORY fmtlib/fmt
-        EXCLUDE_FROM_ALL YES
-    )
-endif()
-CPMFindPackage(
-    NAME spdlog
-    GITHUB_REPOSITORY gabime/spdlog
-    VERSION 1.12.0
-    OPTIONS "BUILD_SHARED_LIBS OFF" "SPDLOG_BUILD_SHARED OFF"
-            "SPDLOG_FMT_EXTERNAL_HO 1"
-)
-if(spdlog_ADDED)
-    set_target_properties(
-        spdlog
-        PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
-                   $<TARGET_PROPERTY:spdlog,INTERFACE_INCLUDE_DIRECTORIES>
+if(GUIX_BUILD)
+    find_package(spdlog REQUIRED)
+else()
+    CPMAddPackage(
+        NAME spdlog
+        GITHUB_REPOSITORY gabime/spdlog
+        VERSION 1.12.0
+        OPTIONS "BUILD_SHARED_LIBS OFF"
     )
 endif()
 
diff --git a/web/data/versions.json b/web/data/versions.json
index 0a470d972e8..6eda2385be2 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -73,8 +73,8 @@
     }
   },
   "cpm": {
-    "package_file_id": 749,
-    "package_file_sha256": "25862fd9b76d5c685cd60432396507822dd547e7ee2e87dffb1126603574efad"
+    "package_file_id": 865,
+    "package_file_sha256": "00db04d08660e131c41fcc20b9cc4046516223c668b0d422e3002775e4d4e967"
   },
   "ext": {
     "cache_hash": "4ebd62e0ce484732dbf3cd9932f60b67762e156b"