diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index a3007dbcaaffe840ffe400a03cf5358dd65b15f5..f67a7bfd0198d932a6c8fdaf66af64e8562e0558 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit a3007dbcaaffe840ffe400a03cf5358dd65b15f5
+Subproject commit f67a7bfd0198d932a6c8fdaf66af64e8562e0558
diff --git a/scripts/cmake/CheckHeaderCompilation.cmake b/scripts/cmake/CheckHeaderCompilation.cmake
index 05bdeec710626823f175e6e53020a5b6c7d9c8c4..07773fbbf562cdd70dd680dee234f3e189d06028 100644
--- a/scripts/cmake/CheckHeaderCompilation.cmake
+++ b/scripts/cmake/CheckHeaderCompilation.cmake
@@ -44,7 +44,7 @@ function(_check_header_compilation target)
         Eigen3::Eigen
         nlohmann_json::nlohmann_json
         range-v3
-        # petsc; is given via ${PETSC_INCLUDES} below.
+        PkgConfig::PETSC
     )
         # Ignore non-existing targets or interface libs
         if(NOT TARGET ${lib})
@@ -73,7 +73,7 @@ function(_check_header_compilation target)
     include(CheckCXXSourceCompiles)
 
     # cmake-lint: disable=C0103
-    set(CMAKE_REQUIRED_INCLUDES ${INCLUDE_DIRS} ${SOURCE_DIR} ${PETSC_INCLUDES})
+    set(CMAKE_REQUIRED_INCLUDES ${INCLUDE_DIRS} ${SOURCE_DIR})
     # HACK, maybe add Gui Widgets Xml XmlPatterns as well
     if(OGS_BUILD_GUI)
         set(CMAKE_REQUIRED_INCLUDES