diff --git a/ApplicationLibCode/UnitTests/CMakeLists.txt b/ApplicationLibCode/UnitTests/CMakeLists.txt
index a66cc3eda0c..63b50b84c0b 100644
--- a/ApplicationLibCode/UnitTests/CMakeLists.txt
+++ b/ApplicationLibCode/UnitTests/CMakeLists.txt
@@ -141,6 +141,18 @@ FetchContent_Declare(
   GIT_TAG release-1.11.0
 )
 
+set(BUILD_GMOCK
+    OFF
+    CACHE BOOL "" FORCE
+)
+set(BUILD_GTEST
+    ON
+    CACHE BOOL "" FORCE
+)
+set(INSTALL_GTEST
+    OFF
+    CACHE BOOL "" FORCE
+)
 FetchContent_MakeAvailable(googletest)
 
 # ##############################################################################
diff --git a/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt b/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt
index 250ee97d265..74384098a2c 100644
--- a/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt
+++ b/ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt
@@ -7,6 +7,10 @@ FetchContent_Declare(
   GIT_REPOSITORY https://github.com/google/googletest.git
   GIT_TAG        release-1.11.0
 )
+
+set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
+set(BUILD_GTEST ON CACHE BOOL "" FORCE)
+set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
 FetchContent_MakeAvailable(googletest)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
diff --git a/ThirdParty/custom-surfio/CMakeLists.txt b/ThirdParty/custom-surfio/CMakeLists.txt
index 017dcd64ef6..4aa985c3711 100644
--- a/ThirdParty/custom-surfio/CMakeLists.txt
+++ b/ThirdParty/custom-surfio/CMakeLists.txt
@@ -8,7 +8,13 @@ FetchContent_Declare(
   GIT_REPOSITORY https://github.com/kokkos/mdspan.git
   GIT_TAG 9ceface91483775a6c74d06ebf717bbb2768452f # mdspan-0.6.0
 )
-FetchContent_MakeAvailable(mdspan)
+
+# Disable install for mdspan by excluding it from INSTALL_ALL
+FetchContent_GetProperties(mdspan)
+if(NOT mdspan_POPULATED)
+  FetchContent_Populate(mdspan)
+  add_subdirectory(${mdspan_SOURCE_DIR} ${mdspan_BINARY_DIR} EXCLUDE_FROM_ALL)
+endif()
 
 # surfio_lib
 set(SRC_PATH "${CMAKE_CURRENT_LIST_DIR}/surfio/src/lib")
@@ -23,7 +29,8 @@ target_sources(
 target_include_directories(
   surfio_lib
   INTERFACE ${SRC_PATH}/include
-  PRIVATE $<BUILD_INTERFACE:${mdspan_SOURCE_DIR}/include/>
   PRIVATE ../mio
 )
 
+target_link_libraries(surfio_lib PRIVATE mdspan)
+
diff --git a/ThirdParty/openzgy b/ThirdParty/openzgy
index 504732e284a..5babbb8937b 160000
--- a/ThirdParty/openzgy
+++ b/ThirdParty/openzgy
@@ -1 +1 @@
-Subproject commit 504732e284a276f20dbdf77557e2da37596d638e
+Subproject commit 5babbb8937bb9914a846951ada561714d021952a