diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0c84939d44b562bfadfc107f557ca1427b54cb3f..c5964b7494f4ee2241b6fb38f05a3107c2cd6422 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -42,10 +42,10 @@ repos:
       - id: cmake-format
         additional_dependencies: ["cmakelang[YAML]"]
         args: [--config=.cmake-format.yaml]
-        exclude: "scripts/cmake/jedbrown/.*|CPM.cmake|FindFilesystem.cmake|FindMKL.cmake|JSONParser.cmake|Tests.cmake"
+        exclude: "CPM.cmake|FindFilesystem.cmake|FindMKL.cmake|JSONParser.cmake|Tests.cmake"
       - id: cmake-lint
         additional_dependencies: ["cmakelang[YAML]"]
-        exclude: "scripts/cmake/jedbrown/.*|CPM.cmake|FindFilesystem.cmake|FindMKL.cmake|JSONParser.cmake|BuildExternalProject.cmake"
+        exclude: "CPM.cmake|FindFilesystem.cmake|FindMKL.cmake|JSONParser.cmake|BuildExternalProject.cmake"
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.33.0
     hooks:
diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index 512ddb5a72af6c8c3b22ec2f0c75d970d7794e59..b4e25fcce00823533822eabe6ff7a846a60e8462 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -10,7 +10,7 @@ target_link_libraries(
     PUBLIC BaseLib GeoLib NumLib
            $<$<TARGET_EXISTS:VTK::ParallelMPI>:VTK::ParallelMPI>
     PRIVATE CMakeInfoLib MathLib MeshLib MeshGeoToolsLib MeshToolsLib pybind11::pybind11
-            $<$<BOOL:${OGS_USE_PETSC}>:petsc>
+            $<$<BOOL:${OGS_USE_PETSC}>:PkgConfig::PETSC>
 )
 
 if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR OGS_BUILD_TESTING)
diff --git a/BaseLib/CMakeLists.txt b/BaseLib/CMakeLists.txt
index 6e331a4ee6e2ed21f4044bb2d314647e7a9693f2..019bb739d239550e50046d717a773f85c18be92b 100644
--- a/BaseLib/CMakeLists.txt
+++ b/BaseLib/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(
            $<$<BOOL:${MSVC}>:WinMM> # needed for timeGetTime
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::Xml>
            $<$<BOOL:${OGS_BUILD_GUI}>:Qt5::XmlPatterns>
-           $<$<BOOL:${OGS_USE_PETSC}>:petsc>
+           $<$<BOOL:${OGS_USE_PETSC}>:PkgConfig::PETSC>
     PRIVATE xmlpatch
 )
 
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index 80187fb711c74c92e208e2e18c860730492e32fc..ca6bd559cd447321031ca2f1b2183efd2316093a 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -31,7 +31,7 @@ target_link_libraries(
            $<$<TARGET_EXISTS:LAPACK::LAPACK>:LAPACK::LAPACK>
            $<$<BOOL:${OGS_USE_LIS}>:${LIS_LIBRARIES}>
            $<$<BOOL:${OGS_USE_CVODE}>:CVODE::CVODE>
-           $<$<BOOL:${OGS_USE_PETSC}>:petsc>
+           $<$<BOOL:${OGS_USE_PETSC}>:PkgConfig::PETSC>
            $<$<BOOL:${OGS_USE_MKL}>:MKL::MKL>
            Eigen3::Eigen
            $<$<TARGET_EXISTS:OpenMP::OpenMP_CXX>:OpenMP::OpenMP_CXX>
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 9e105b36f7e0500fdbd3f07a6d51d140988d839d..a3007dbcaaffe840ffe400a03cf5358dd65b15f5 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 9e105b36f7e0500fdbd3f07a6d51d140988d839d
+Subproject commit a3007dbcaaffe840ffe400a03cf5358dd65b15f5
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 7787fbeb03517155e0e5e39b2c205efd2a20efe5..c5248ca38cbbfc0a06261b7aa8e81a7b6bce8ec3 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -19,7 +19,6 @@ endif()
 # Set additional CMake modules path
 set(CMAKE_MODULE_PATH
     ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/scripts/cmake"
-    "${PROJECT_SOURCE_DIR}/scripts/cmake/jedbrown"
     "${PROJECT_SOURCE_DIR}/scripts/cmake/vector-of-bool"
 )
 
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index db1dd9e1882834486fb32661970a378417767fa8..0b749d9a63f5451b7bc400a269cdb8f985fc8f98 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -499,7 +499,7 @@ if(CLANG_FORMAT_PROGRAM OR CMAKE_FORMAT_PROGRAM)
         GITHUB_REPOSITORY TheLartians/Format.cmake
         OPTIONS
             ${_skip_cmake}
-            "CMAKE_FORMAT_EXCLUDE scripts/cmake/CPM.cmake|.*/Tests.cmake|scripts/cmake/jedbrown/.*|scripts/cmake/vector-of-bool/.*"
+            "CMAKE_FORMAT_EXCLUDE scripts/cmake/CPM.cmake|.*/Tests.cmake|scripts/cmake/vector-of-bool/.*"
     )
 endif()
 
diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake
index 0d053fb1650ceba9e1ee74caf05a6afaf85bed47..7d9db0892d3b432e7a8b15d5ca509895c582d2bc 100644
--- a/scripts/cmake/DependenciesExternalProject.cmake
+++ b/scripts/cmake/DependenciesExternalProject.cmake
@@ -142,7 +142,8 @@ if(OGS_USE_PETSC)
     if(EXISTS ${_petsc_source_file})
         set(_petsc_source URL ${_petsc_source_file})
     elseif(NOT (OGS_PETSC_CONFIG_OPTIONS OR OGS_BUILD_PETSC))
-        find_package(PETSc ${ogs.minimum_version.petsc})
+        find_package(PkgConfig REQUIRED)
+        pkg_search_module(PETSC IMPORTED_TARGET PETSc)
     endif()
 
     if(NOT PETSC_FOUND)
@@ -172,17 +173,12 @@ if(OGS_USE_PETSC)
                 "ExternalProject_Add(): added package PETSc@${ogs.minimum_version.petsc}"
         )
         set(_EXT_LIBS ${_EXT_LIBS} PETSc CACHE INTERNAL "")
-        BuildExternalProject_find_package(PETSc)
+        set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${build_dir_PETSc})
     endif()
 
-    add_library(petsc SHARED IMPORTED)
-    target_include_directories(petsc INTERFACE ${PETSC_INCLUDES})
-    # Get first petsc lib as import location
-    list(GET PETSC_LIBRARIES 0 _first_petsc_lib)
-    set_target_properties(
-        petsc PROPERTIES IMPORTED_LOCATION ${_first_petsc_lib}
-    )
-    target_compile_definitions(petsc INTERFACE USE_PETSC)
+    find_package(PkgConfig REQUIRED)
+    pkg_search_module(PETSC REQUIRED IMPORTED_TARGET PETSc)
+    target_compile_definitions(PkgConfig::PETSC INTERFACE USE_PETSC)
 endif()
 
 if(OGS_USE_LIS)
diff --git a/scripts/cmake/jedbrown/CorrectWindowsPaths.cmake b/scripts/cmake/jedbrown/CorrectWindowsPaths.cmake
deleted file mode 100644
index 33b767b1b1daa054776f4b1d61bf36c978b58fa3..0000000000000000000000000000000000000000
--- a/scripts/cmake/jedbrown/CorrectWindowsPaths.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-# CorrectWindowsPaths - this module defines one macro
-#
-# CONVERT_CYGWIN_PATH( PATH )
-#  This uses the command cygpath (provided by cygwin) to convert
-#  unix-style paths into paths usable by cmake on windows
-
-macro (CONVERT_CYGWIN_PATH _path)
-  if (WIN32)
-    EXECUTE_PROCESS(COMMAND cygpath.exe -m ${${_path}}
-      OUTPUT_VARIABLE ${_path})
-    string (STRIP ${${_path}} ${_path})
-  endif (WIN32)
-endmacro (CONVERT_CYGWIN_PATH)
diff --git a/scripts/cmake/jedbrown/FindPETSc.cmake b/scripts/cmake/jedbrown/FindPETSc.cmake
deleted file mode 100644
index 3e2a99045844218a944a7acdaeb875ec4625e8a6..0000000000000000000000000000000000000000
--- a/scripts/cmake/jedbrown/FindPETSc.cmake
+++ /dev/null
@@ -1,347 +0,0 @@
-# - Try to find PETSc
-# Once done this will define
-#
-#  PETSC_FOUND        - system has PETSc
-#  PETSC_INCLUDES     - the PETSc include directories
-#  PETSC_LIBRARIES    - Link these to use PETSc
-#  PETSC_COMPILER     - Compiler used by PETSc, helpful to find a compatible MPI
-#  PETSC_DEFINITIONS  - Compiler switches for using PETSc
-#  PETSC_MPIEXEC      - Executable for running MPI programs
-#  PETSC_VERSION      - Version string (MAJOR.MINOR.SUBMINOR)
-#
-#  Usage:
-#  find_package(PETSc COMPONENTS CXX)  - required if build --with-clanguage=C++ --with-c-support=0
-#  find_package(PETSc COMPONENTS C)    - standard behavior of checking build using a C compiler
-#  find_package(PETSc)                 - same as above
-#
-# Setting these changes the behavior of the search
-#  PETSC_DIR - directory in which PETSc resides
-#  PETSC_ARCH - build architecture
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-cmake_policy(VERSION 3.3)
-
-set(PETSC_VALID_COMPONENTS
-  C
-  CXX)
-
-if(NOT PETSc_FIND_COMPONENTS)
-  get_property (_enabled_langs GLOBAL PROPERTY ENABLED_LANGUAGES)
-  if ("C" IN_LIST _enabled_langs)
-    set(PETSC_LANGUAGE_BINDINGS "C")
-  else ()
-    set(PETSC_LANGUAGE_BINDINGS "CXX")
-  endif ()
-else()
-  # Right now, this is designed for compatibility with the --with-clanguage option, so
-  # only allow one item in the components list.
-  list(LENGTH ${PETSc_FIND_COMPONENTS} components_length)
-  if(${components_length} GREATER 1)
-    message(FATAL_ERROR "Only one component for PETSc is allowed to be specified")
-  endif()
-  # This is a stub for allowing multiple components should that time ever come. Perhaps
-  # to also test Fortran bindings?
-  foreach(component ${PETSc_FIND_COMPONENTS})
-    list(FIND PETSC_VALID_COMPONENTS ${component} component_location)
-    if(${component_location} EQUAL -1)
-      message(FATAL_ERROR "\"${component}\" is not a valid PETSc component.")
-    else()
-      list(APPEND PETSC_LANGUAGE_BINDINGS ${component})
-    endif()
-  endforeach()
-endif()
-
-function (petsc_get_version)
-  if (EXISTS "${PETSC_DIR}/include/petscversion.h")
-    file (STRINGS "${PETSC_DIR}/include/petscversion.h" vstrings REGEX "#define PETSC_VERSION_(RELEASE|MAJOR|MINOR|SUBMINOR|PATCH) ")
-    foreach (line ${vstrings})
-      string (REGEX REPLACE " +" ";" fields ${line}) # break line into three fields (the first is always "#define")
-      list (GET fields 1 var)
-      list (GET fields 2 val)
-      set (${var} ${val} PARENT_SCOPE)
-      set (${var} ${val})         # Also in local scope so we have access below
-    endforeach ()
-    if (PETSC_VERSION_RELEASE)
-      if ($(PETSC_VERSION_PATCH) GREATER 0)
-        set (PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}p${PETSC_VERSION_PATCH}" CACHE INTERNAL "PETSc version")
-      else ()
-        set (PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}" CACHE INTERNAL "PETSc version")
-      endif ()
-    else ()
-      # make dev version compare higher than any patch level of a released version
-      set (PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}.99" CACHE INTERNAL "PETSc version")
-    endif ()
-  else ()
-    message (SEND_ERROR "PETSC_DIR can not be used, ${PETSC_DIR}/include/petscversion.h does not exist")
-  endif ()
-endfunction ()
-
-# Debian uses versioned paths e.g /usr/lib/petscdir/3.5/
-file (GLOB DEB_PATHS "/usr/lib/petscdir/*")
-
-find_path (PETSC_DIR include/petsc.h
-  HINTS ENV PETSC_DIR
-  PATHS
-  /usr/lib/petsc
-  # Debian paths
-  ${DEB_PATHS}
-  # Arch Linux path
-  /opt/petsc/linux-c-opt
-  # MacPorts path
-  /opt/local/lib/petsc
-  $ENV{HOME}/petsc
-  DOC "PETSc Directory")
-
-find_program (MAKE_EXECUTABLE NAMES make gmake)
-
-if (PETSC_DIR AND NOT PETSC_ARCH)
-  set (_petsc_arches
-    $ENV{PETSC_ARCH}                   # If set, use environment variable first
-    linux-gnu-c-debug linux-gnu-c-opt  # Debian defaults
-    arch-darwin-c-debug arch-darwin-c-opt
-    x86_64-unknown-linux-gnu i386-unknown-linux-gnu)
-  set (petscconf "NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
-  foreach (arch ${_petsc_arches})
-    if (NOT PETSC_ARCH)
-      find_path (petscconf petscconf.h
-        HINTS ${PETSC_DIR}
-        PATH_SUFFIXES ${arch}/include bmake/${arch}
-        NO_DEFAULT_PATH)
-      if (petscconf)
-        set (PETSC_ARCH "${arch}" CACHE STRING "PETSc build architecture")
-      endif (petscconf)
-    endif (NOT PETSC_ARCH)
-  endforeach (arch)
-  set (petscconf "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE)
-endif (PETSC_DIR AND NOT PETSC_ARCH)
-
-set (petsc_slaves LIBRARIES_SYS LIBRARIES_VEC LIBRARIES_MAT LIBRARIES_DM LIBRARIES_KSP LIBRARIES_SNES LIBRARIES_TS
-  INCLUDE_DIR INCLUDE_CONF)
-include (FindPackageMultipass)
-find_package_multipass (PETSc petsc_config_current
-  STATES DIR ARCH
-  DEPENDENTS INCLUDES LIBRARIES COMPILER MPIEXEC ${petsc_slaves})
-
-# Determine whether the PETSc layout is old-style (through 2.3.3) or
-# new-style (>= 3.0.0)
-if (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/lib/petsc/conf/petscvariables") # > 3.5
-  set (petsc_conf_rules "${PETSC_DIR}/lib/petsc/conf/rules")
-  set (petsc_conf_variables "${PETSC_DIR}/lib/petsc/conf/variables")
-elseif (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/include/petscconf.h")   # > 2.3.3
-  set (petsc_conf_rules "${PETSC_DIR}/conf/rules")
-  set (petsc_conf_variables "${PETSC_DIR}/conf/variables")
-elseif (EXISTS "${PETSC_DIR}/bmake/${PETSC_ARCH}/petscconf.h") # <= 2.3.3
-  set (petsc_conf_rules "${PETSC_DIR}/bmake/common/rules")
-  set (petsc_conf_variables "${PETSC_DIR}/bmake/common/variables")
-elseif (PETSC_DIR)
-  message (SEND_ERROR "The pair PETSC_DIR=${PETSC_DIR} PETSC_ARCH=${PETSC_ARCH} do not specify a valid PETSc installation")
-endif ()
-
-if (petsc_conf_rules AND petsc_conf_variables AND NOT petsc_config_current)
-  petsc_get_version()
-
-  # Put variables into environment since they are needed to get
-  # configuration (petscvariables) in the PETSc makefile
-  set (ENV{PETSC_DIR} "${PETSC_DIR}")
-  set (ENV{PETSC_ARCH} "${PETSC_ARCH}")
-
-  # A temporary makefile to probe the PETSc configuration
-  set (petsc_config_makefile "${PROJECT_BINARY_DIR}/Makefile.petsc")
-  file (WRITE "${petsc_config_makefile}"
-"## This file was autogenerated by FindPETSc.cmake
-# PETSC_DIR  = ${PETSC_DIR}
-# PETSC_ARCH = ${PETSC_ARCH}
-include ${petsc_conf_rules}
-include ${petsc_conf_variables}
-show :
-\t-@echo -n \${\${VARIABLE}}
-")
-
-  macro (PETSC_GET_VARIABLE name var)
-    set (${var} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
-    execute_process (COMMAND ${MAKE_EXECUTABLE} --no-print-directory -f ${petsc_config_makefile} show VARIABLE=${name}
-      OUTPUT_VARIABLE ${var}
-      RESULT_VARIABLE petsc_return)
-  endmacro (PETSC_GET_VARIABLE)
-  petsc_get_variable (PETSC_LIB_DIR            petsc_lib_dir)
-  petsc_get_variable (PETSC_EXTERNAL_LIB_BASIC petsc_libs_external)
-  petsc_get_variable (PETSC_CCPPFLAGS          petsc_cpp_line)
-  petsc_get_variable (PETSC_INCLUDE            petsc_include)
-  petsc_get_variable (PCC                      petsc_cc)
-  petsc_get_variable (PCC_FLAGS                petsc_cc_flags)
-  petsc_get_variable (MPIEXEC                  petsc_mpiexec)
-  # We are done with the temporary Makefile, calling PETSC_GET_VARIABLE after this point is invalid!
-  file (REMOVE ${petsc_config_makefile})
-
-  include (ResolveCompilerPaths)
-  # Extract include paths and libraries from compile command line
-  resolve_includes (petsc_includes_all "${petsc_cpp_line}")
-
-  #on windows we need to make sure we're linking against the right
-  #runtime library
-  if (WIN32)
-    if (petsc_cc_flags MATCHES "-MT")
-      set(using_md False)
-      foreach(flag_var
-          CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
-          CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
-          CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-          CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-        if(${flag_var} MATCHES "/MD")
-          set(using_md True)
-        endif(${flag_var} MATCHES "/MD")
-      endforeach(flag_var)
-      if(${using_md} MATCHES "True")
-        message(WARNING "PETSc was built with /MT, but /MD is currently set.
- See http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F")
-      endif(${using_md} MATCHES "True")
-    endif (petsc_cc_flags MATCHES "-MT")
-  endif (WIN32)
-
-  include (CorrectWindowsPaths)
-  convert_cygwin_path(petsc_lib_dir)
-  message (STATUS "petsc_lib_dir ${petsc_lib_dir}")
-
-  macro (PETSC_FIND_LIBRARY suffix name)
-    set (PETSC_LIBRARY_${suffix} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) # Clear any stale value, if we got here, we need to find it again
-    if (WIN32)
-      set (libname lib${name}) #windows expects "libfoo", linux expects "foo"
-    else (WIN32)
-      set (libname ${name})
-    endif (WIN32)
-    find_library (PETSC_LIBRARY_${suffix} NAMES ${libname} HINTS ${petsc_lib_dir} NO_DEFAULT_PATH)
-    set (PETSC_LIBRARIES_${suffix} "${PETSC_LIBRARY_${suffix}}")
-    mark_as_advanced (PETSC_LIBRARY_${suffix})
-  endmacro (PETSC_FIND_LIBRARY suffix name)
-
-  # Look for petscvec first, if it doesn't exist, we must be using single-library
-  petsc_find_library (VEC petscvec)
-  if (PETSC_LIBRARY_VEC)
-    petsc_find_library (SYS  "petscsys;petsc") # libpetscsys is called libpetsc prior to 3.1 (when single-library was introduced)
-    petsc_find_library (MAT  petscmat)
-    petsc_find_library (DM   petscdm)
-    petsc_find_library (KSP  petscksp)
-    petsc_find_library (SNES petscsnes)
-    petsc_find_library (TS   petscts)
-    macro (PETSC_JOIN libs deps)
-      list (APPEND PETSC_LIBRARIES_${libs} ${PETSC_LIBRARIES_${deps}})
-    endmacro (PETSC_JOIN libs deps)
-    petsc_join (VEC  SYS)
-    petsc_join (MAT  VEC)
-    petsc_join (DM   MAT)
-    petsc_join (KSP  DM)
-    petsc_join (SNES KSP)
-    petsc_join (TS   SNES)
-    petsc_join (ALL  TS)
-  else ()
-    set (PETSC_LIBRARY_VEC "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) # There is no libpetscvec
-    petsc_find_library (SINGLE petsc)
-    # Debian 9/Ubuntu 16.04 uses _real and _complex extensions when using libraries in /usr/lib/petsc.
-    if (NOT PETSC_LIBRARY_SINGLE)
-      petsc_find_library (SINGLE petsc_real)
-    endif()
-    if (NOT PETSC_LIBRARY_SINGLE)
-      petsc_find_library (SINGLE petsc_complex)
-    endif()
-    foreach (pkg SYS VEC MAT DM KSP SNES TS ALL)
-      set (PETSC_LIBRARIES_${pkg} "${PETSC_LIBRARY_SINGLE}")
-    endforeach ()
-  endif ()
-  if (PETSC_LIBRARY_TS)
-    message (STATUS "Recognized PETSc install with separate libraries for each package")
-  else ()
-    message (STATUS "Recognized PETSc install with single library for all packages")
-  endif ()
-
-  include(Check${PETSC_LANGUAGE_BINDINGS}SourceRuns)
-  macro (PETSC_TEST_RUNS includes libraries runs)
-    if (PETSC_VERSION VERSION_GREATER 3.1)
-      set (_PETSC_TSDestroy "TSDestroy(&ts)")
-    else ()
-      set (_PETSC_TSDestroy "TSDestroy(ts)")
-    endif ()
-
-    set(_PETSC_TEST_SOURCE "
-static const char help[] = \"PETSc test program.\";
-#include <petscts.h>
-int main(int argc,char *argv[]) {
-  PetscErrorCode ierr;
-  TS ts;
-
-  ierr = PetscInitialize(&argc,&argv,0,help);CHKERRQ(ierr);
-  ierr = TSCreate(PETSC_COMM_WORLD,&ts);CHKERRQ(ierr);
-  ierr = TSSetFromOptions(ts);CHKERRQ(ierr);
-  ierr = ${_PETSC_TSDestroy};CHKERRQ(ierr);
-  ierr = PetscFinalize();CHKERRQ(ierr);
-  return 0;
-}
-")
-    multipass_source_runs ("${includes}" "${libraries}" "${_PETSC_TEST_SOURCE}" ${runs} "${PETSC_LANGUAGE_BINDINGS}")
-    if (${${runs}})
-      set (PETSC_EXECUTABLE_RUNS "YES" CACHE BOOL
-        "Can the system successfully run a PETSc executable?  This variable can be manually set to \"YES\" to force CMake to accept a given PETSc configuration, but this will almost always result in a broken build.  If you change PETSC_DIR, PETSC_ARCH, or PETSC_CURRENT you would have to reset this variable." FORCE)
-    endif (${${runs}})
-  endmacro (PETSC_TEST_RUNS)
-
-
-  find_path (PETSC_INCLUDE_DIR petscts.h HINTS "${PETSC_DIR}" PATH_SUFFIXES include NO_DEFAULT_PATH)
-  find_path (PETSC_INCLUDE_CONF petscconf.h HINTS "${PETSC_DIR}" PATH_SUFFIXES "${PETSC_ARCH}/include" "bmake/${PETSC_ARCH}" NO_DEFAULT_PATH)
-  mark_as_advanced (PETSC_INCLUDE_DIR PETSC_INCLUDE_CONF)
-  set (petsc_includes_minimal ${PETSC_INCLUDE_CONF} ${PETSC_INCLUDE_DIR})
-
-  petsc_test_runs ("${petsc_includes_minimal}" "${PETSC_LIBRARIES_TS}" petsc_works_minimal)
-  if (petsc_works_minimal)
-    message (STATUS "Minimal PETSc includes and libraries work.  This probably means we are building with shared libs.")
-    set (petsc_includes_needed "${petsc_includes_minimal}")
-  else (petsc_works_minimal)     # Minimal includes fail, see if just adding full includes fixes it
-    petsc_test_runs ("${petsc_includes_all}" "${PETSC_LIBRARIES_TS}" petsc_works_allincludes)
-    if (petsc_works_allincludes) # It does, we just need all the includes (
-      message (STATUS "PETSc requires extra include paths, but links correctly with only interface libraries.  This is an unexpected configuration (but it seems to work fine).")
-      set (petsc_includes_needed ${petsc_includes_all})
-    else (petsc_works_allincludes) # We are going to need to link the external libs explicitly
-      resolve_libraries (petsc_libraries_external "${petsc_libs_external}")
-      foreach (pkg SYS VEC MAT DM KSP SNES TS ALL)
-        list (APPEND PETSC_LIBRARIES_${pkg}  ${petsc_libraries_external})
-      endforeach (pkg)
-      petsc_test_runs ("${petsc_includes_minimal}" "${PETSC_LIBRARIES_TS}" petsc_works_alllibraries)
-      if (petsc_works_alllibraries)
-         message (STATUS "PETSc only need minimal includes, but requires explicit linking to all dependencies.  This is expected when PETSc is built with static libraries.")
-        set (petsc_includes_needed ${petsc_includes_minimal})
-      else (petsc_works_alllibraries)
-        # It looks like we really need everything, should have listened to Matt
-        set (petsc_includes_needed ${petsc_includes_all})
-        petsc_test_runs ("${petsc_includes_all}" "${PETSC_LIBRARIES_TS}" petsc_works_all)
-        if (petsc_works_all) # We fail anyways
-          message (STATUS "PETSc requires extra include paths and explicit linking to all dependencies.  This probably means you have static libraries and something unexpected in PETSc headers.")
-        else (petsc_works_all) # We fail anyways
-          message (STATUS "PETSc could not be used, maybe the install is broken.")
-        endif (petsc_works_all)
-      endif (petsc_works_alllibraries)
-    endif (petsc_works_allincludes)
-  endif (petsc_works_minimal)
-
-  # We do an out-of-source build so __FILE__ will be an absolute path, hence __INSDIR__ is superfluous
-  if (${PETSC_VERSION} VERSION_LESS 3.1)
-    set (PETSC_DEFINITIONS "-D__SDIR__=\"\"" CACHE STRING "PETSc definitions" FORCE)
-  else ()
-    set (PETSC_DEFINITIONS "-D__INSDIR__=" CACHE STRING "PETSc definitions" FORCE)
-  endif ()
-  # Sometimes this can be used to assist FindMPI.cmake
-  set (PETSC_MPIEXEC ${petsc_mpiexec} CACHE FILEPATH "Executable for running PETSc MPI programs" FORCE)
-  set (PETSC_INCLUDES ${petsc_includes_needed} CACHE STRING "PETSc include path" FORCE)
-  set (PETSC_LIBRARIES ${PETSC_LIBRARIES_ALL} CACHE STRING "PETSc libraries" FORCE)
-  set (PETSC_COMPILER ${petsc_cc} CACHE FILEPATH "PETSc compiler" FORCE)
-  # Note that we have forced values for all these choices.  If you
-  # change these, you are telling the system to trust you that they
-  # work.  It is likely that you will end up with a broken build.
-  mark_as_advanced (PETSC_INCLUDES PETSC_LIBRARIES PETSC_COMPILER PETSC_DEFINITIONS PETSC_MPIEXEC PETSC_EXECUTABLE_RUNS)
-endif ()
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (PETSc
-  REQUIRED_VARS PETSC_INCLUDES PETSC_LIBRARIES PETSC_EXECUTABLE_RUNS
-  VERSION_VAR PETSC_VERSION
-  FAIL_MESSAGE "PETSc could not be found.  Be sure to set PETSC_DIR and PETSC_ARCH.")
diff --git a/scripts/cmake/jedbrown/FindPackageMultipass.cmake b/scripts/cmake/jedbrown/FindPackageMultipass.cmake
deleted file mode 100644
index 763fed3423f64658769a68c3983f8b615a69e15f..0000000000000000000000000000000000000000
--- a/scripts/cmake/jedbrown/FindPackageMultipass.cmake
+++ /dev/null
@@ -1,106 +0,0 @@
-# PackageMultipass - this module defines two macros
-#
-# FIND_PACKAGE_MULTIPASS (Name CURRENT
-#  STATES VAR0 VAR1 ...
-#  DEPENDENTS DEP0 DEP1 ...)
-#
-#  This function creates a cache entry <UPPERCASED-Name>_CURRENT which
-#  the user can set to "NO" to trigger a reconfiguration of the package.
-#  The first time this function is called, the values of
-#  <UPPERCASED-Name>_VAR0, ... are saved.  If <UPPERCASED-Name>_CURRENT
-#  is false or if any STATE has changed since the last time
-#  FIND_PACKAGE_MULTIPASS() was called, then CURRENT will be set to "NO",
-#  otherwise CURRENT will be "YES".  IF not CURRENT, then
-#  <UPPERCASED-Name>_DEP0, ... will be FORCED to NOTFOUND.
-#  Example:
-#    find_path (FOO_DIR include/foo.h)
-#    FIND_PACKAGE_MULTIPASS (Foo foo_current
-#      STATES DIR
-#      DEPENDENTS INCLUDES LIBRARIES)
-#    if (NOT foo_current)
-#      # Make temporary files, run programs, etc, to determine FOO_INCLUDES and FOO_LIBRARIES
-#    endif (NOT foo_current)
-#
-# MULTIPASS_SOURCE_RUNS (Name INCLUDES LIBRARIES SOURCE RUNS LANGUAGE)
-#  Always runs the given test, use this when you need to re-run tests
-#  because parent variables have made old cache entries stale. The LANGUAGE
-#  variable is either C or CXX indicating which compiler the test should
-#  use.
-# MULTIPASS_C_SOURCE_RUNS (Name INCLUDES LIBRARIES SOURCE RUNS)
-#  DEPRECATED! This is only included for backwards compatibility. Use
-#  the more general MULTIPASS_SOURCE_RUNS instead.
-#  Always runs the given test, use this when you need to re-run tests
-#  because parent variables have made old cache entries stale.
-
-macro (FIND_PACKAGE_MULTIPASS _name _current)
-  string (TOUPPER ${_name} _NAME)
-  set (_args ${ARGV})
-  list (REMOVE_AT _args 0 1)
-
-  set (_states_current "YES")
-  list (GET _args 0 _cmd)
-  if (_cmd STREQUAL "STATES")
-    list (REMOVE_AT _args 0)
-    list (GET _args 0 _state)
-    while (_state AND NOT _state STREQUAL "DEPENDENTS")
-      # The name of the stored value for the given state
-      set (_stored_var PACKAGE_MULTIPASS_${_NAME}_${_state})
-      if (NOT "${${_stored_var}}" STREQUAL "${${_NAME}_${_state}}")
-        set (_states_current "NO")
-      endif (NOT "${${_stored_var}}" STREQUAL "${${_NAME}_${_state}}")
-      set (${_stored_var} "${${_NAME}_${_state}}" CACHE INTERNAL "Stored state for ${_name}." FORCE)
-      list (REMOVE_AT _args 0)
-      list (GET _args 0 _state)
-    endwhile (_state AND NOT _state STREQUAL "DEPENDENTS")
-  endif (_cmd STREQUAL "STATES")
-
-  set (_stored ${_NAME}_CURRENT)
-  if (NOT ${_stored})
-    set (${_stored} "YES" CACHE BOOL "Is the configuration for ${_name} current?  Set to \"NO\" to reconfigure." FORCE)
-    set (_states_current "NO")
-  endif (NOT ${_stored})
-
-  set (${_current} ${_states_current})
-  if (NOT ${_current} AND PACKAGE_MULTIPASS_${_name}_CALLED)
-    message (STATUS "Clearing ${_name} dependent variables")
-    # Clear all the dependent variables so that the module can reset them
-    list (GET _args 0 _cmd)
-    if (_cmd STREQUAL "DEPENDENTS")
-      list (REMOVE_AT _args 0)
-      foreach (dep ${_args})
-        set (${_NAME}_${dep} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
-      endforeach (dep)
-    endif (_cmd STREQUAL "DEPENDENTS")
-    set (${_NAME}_FOUND "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
-  endif ()
-  set (PACKAGE_MULTIPASS_${name}_CALLED YES CACHE INTERNAL "Private" FORCE)
-endmacro (FIND_PACKAGE_MULTIPASS)
-
-
-macro (MULTIPASS_SOURCE_RUNS includes libraries source runs language)
-  include (Check${language}SourceRuns)
-  # This is a ridiculous hack.  CHECK_${language}_SOURCE_* thinks that if the
-  # *name* of the return variable doesn't change, then the test does
-  # not need to be re-run.  We keep an internal count which we
-  # increment to guarantee that every test name is unique.  If we've
-  # gotten here, then the configuration has changed enough that the
-  # test *needs* to be rerun.
-  if (NOT MULTIPASS_TEST_COUNT)
-    set (MULTIPASS_TEST_COUNT 00)
-  endif (NOT MULTIPASS_TEST_COUNT)
-  math (EXPR _tmp "${MULTIPASS_TEST_COUNT} + 1") # Why can't I add to a cache variable?
-  set (MULTIPASS_TEST_COUNT ${_tmp} CACHE INTERNAL "Unique test ID")
-  set (testname MULTIPASS_TEST_${MULTIPASS_TEST_COUNT}_${runs})
-  set (CMAKE_REQUIRED_INCLUDES ${includes})
-  set (CMAKE_REQUIRED_LIBRARIES ${libraries})
-  if(${language} STREQUAL "C")
-    check_c_source_runs ("${source}" ${testname})
-  elseif(${language} STREQUAL "CXX")
-    check_cxx_source_runs ("${source}" ${testname})
-  endif()
-  set (${runs} "${${testname}}")
-endmacro (MULTIPASS_SOURCE_RUNS)
-
-macro (MULTIPASS_C_SOURCE_RUNS includes libraries source runs)
-  multipass_source_runs("${includes}" "${libraries}" "${source}" ${runs} "C")
-endmacro (MULTIPASS_C_SOURCE_RUNS)
diff --git a/scripts/cmake/jedbrown/LICENSE b/scripts/cmake/jedbrown/LICENSE
deleted file mode 100644
index 49bac9892af49f867817ca73496499cd6a6fbf89..0000000000000000000000000000000000000000
--- a/scripts/cmake/jedbrown/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright $(git shortlog -s)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/scripts/cmake/jedbrown/README.md b/scripts/cmake/jedbrown/README.md
deleted file mode 100644
index 8a11f28c18e081c20b5ba73c6e6df6ca67bfe97d..0000000000000000000000000000000000000000
--- a/scripts/cmake/jedbrown/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Copied the following files from https://github.com/jedbrown/cmake-modules:
-
-- FindPETSC.cmake
diff --git a/scripts/cmake/jedbrown/ResolveCompilerPaths.cmake b/scripts/cmake/jedbrown/ResolveCompilerPaths.cmake
deleted file mode 100644
index cf9abd5a92329dc14c7e0b0d41f3ae39f6e1b161..0000000000000000000000000000000000000000
--- a/scripts/cmake/jedbrown/ResolveCompilerPaths.cmake
+++ /dev/null
@@ -1,105 +0,0 @@
-# ResolveCompilerPaths - this module defines two macros
-#
-# RESOLVE_LIBRARIES (XXX_LIBRARIES LINK_LINE)
-#  This macro is intended to be used by FindXXX.cmake modules.
-#  It parses a compiler link line and resolves all libraries
-#  (-lfoo) using the library path contexts (-L/path) in scope.
-#  The result in XXX_LIBRARIES is the list of fully resolved libs.
-#  Example:
-#
-#    RESOLVE_LIBRARIES (FOO_LIBRARIES "-L/A -la -L/B -lb -lc -ld")
-#
-#  will be resolved to
-#
-#    FOO_LIBRARIES:STRING="/A/liba.so;/B/libb.so;/A/libc.so;/usr/lib/libd.so"
-#
-#  if the filesystem looks like
-#
-#    /A:       liba.so         libc.so
-#    /B:       liba.so libb.so
-#    /usr/lib: liba.so libb.so libc.so libd.so
-#
-#  and /usr/lib is a system directory.
-#
-#  Note: If RESOLVE_LIBRARIES() resolves a link line differently from
-#  the native linker, there is a bug in this macro (please report it).
-#
-# RESOLVE_INCLUDES (XXX_INCLUDES INCLUDE_LINE)
-#  This macro is intended to be used by FindXXX.cmake modules.
-#  It parses a compile line and resolves all includes
-#  (-I/path/to/include) to a list of directories.  Other flags are ignored.
-#  Example:
-#
-#    RESOLVE_INCLUDES (FOO_INCLUDES "-I/A -DBAR='\"irrelevant -I/string here\"' -I/B")
-#
-#  will be resolved to
-#
-#    FOO_INCLUDES:STRING="/A;/B"
-#
-#  assuming both directories exist.
-#  Note: as currently implemented, the -I/string will be picked up mistakenly (cry, cry)
-include (CorrectWindowsPaths)
-
-macro (RESOLVE_LIBRARIES LIBS LINK_LINE)
-  string (REGEX MATCHALL "((-L|-l|-Wl)([^\" ]+|\"[^\"]+\")|[^\" ]+\\.(a|so|dll|lib))" _all_tokens "${LINK_LINE}")
-  set (_libs_found)
-  set (_directory_list)
-  foreach (token ${_all_tokens})
-    if (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
-      # If it's a library path, add it to the list
-      string (REGEX REPLACE "^-L" "" token ${token})
-      string (REGEX REPLACE "//" "/" token ${token})
-      convert_cygwin_path(token)
-      list (APPEND _directory_list ${token})
-    elseif (token MATCHES "^(-l([^\" ]+|\"[^\"]+\")|[^\" ]+\\.(a|so|dll|lib))")
-      # It's a library, resolve the path by looking in the list and then (by default) in system directories
-      if (WIN32) #windows expects "libfoo", linux expects "foo"
-        string (REGEX REPLACE "^-l" "lib" token ${token})
-      else (WIN32)
-        string (REGEX REPLACE "^-l" "" token ${token})
-      endif (WIN32)
-      set (_root)
-      if (token MATCHES "^/")	# We have an absolute path
-        #separate into a path and a library name:
-        string (REGEX MATCH "[^/]*\\.(a|so|dll|lib)$" libname ${token})
-        string (REGEX MATCH ".*[^${libname}$]" libpath ${token})
-        convert_cygwin_path(libpath)
-        set (_directory_list ${_directory_list} ${libpath})
-        set (token ${libname})
-      endif (token MATCHES "^/")
-      set (_lib "NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
-      find_library (_lib ${token} HINTS ${_directory_list} ${_root})
-      if (_lib)
-	string (REPLACE "//" "/" _lib ${_lib})
-        list (APPEND _libs_found ${_lib})
-      else (_lib)
-        message (STATUS "Unable to find library ${token}")
-      endif (_lib)
-    endif (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
-  endforeach (token)
-  set (_lib "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE)
-  # only the LAST occurrence of each library is required since there should be no circular dependencies
-  if (_libs_found)
-    list (REVERSE _libs_found)
-    list (REMOVE_DUPLICATES _libs_found)
-    list (REVERSE _libs_found)
-  endif (_libs_found)
-  set (${LIBS} "${_libs_found}")
-endmacro (RESOLVE_LIBRARIES)
-
-macro (RESOLVE_INCLUDES INCS COMPILE_LINE)
-  string (REGEX MATCHALL "-I([^\" ]+|\"[^\"]+\")" _all_tokens "${COMPILE_LINE}")
-  set (_incs_found "")
-  foreach (token ${_all_tokens})
-    string (REGEX REPLACE "^-I" "" token ${token})
-    string (REGEX REPLACE "//" "/" token ${token})
-    convert_cygwin_path(token)
-    if (EXISTS ${token})
-      list (APPEND _incs_found ${token})
-    else (EXISTS ${token})
-      message (STATUS "Include directory ${token} does not exist")
-    endif (EXISTS ${token})
-  endforeach (token)
-  list (REMOVE_DUPLICATES _incs_found)
-  set (${INCS} "${_incs_found}")
-endmacro (RESOLVE_INCLUDES)
diff --git a/scripts/guix/channels.scm b/scripts/guix/channels.scm
index 16f780fc8435425d29ac640dc1658c1ea23ebcca..b5313a9bf9524e1e54b021cafec82d56f7cf7bd1 100644
--- a/scripts/guix/channels.scm
+++ b/scripts/guix/channels.scm
@@ -2,7 +2,7 @@
         (name 'guix-ogs)
         (url "https://gitlab.opengeosys.org/ogs/inf/guix-ogs.git")
         (branch "master")
-        (commit "6b51c1b7216ec1fbd6231720434c3b307bec2c0b"))
+        (commit "0a7131e440104b4391774c0c5ba79099dceba592"))
       (channel
         (name 'guix)
         (url "https://git.savannah.gnu.org/git/guix.git")
diff --git a/web/content/docs/devguide/getting-started/build-configuration/index.md b/web/content/docs/devguide/getting-started/build-configuration/index.md
index 00a6c05680895c81f4686ba6e9398e6b0b95fcb5..134857424ecae64ffb593599d8b4a2646f07e528 100644
--- a/web/content/docs/devguide/getting-started/build-configuration/index.md
+++ b/web/content/docs/devguide/getting-started/build-configuration/index.md
@@ -36,12 +36,13 @@ We provide CMake configuration presets defined in [CMakePresets.json](https://gi
 | CLI Debug     | debug         | msvc-debug       |
 | GUI Release   | release-gui   | msvc-release-gui |
 | GUI Debug     | debug-gui     | msvc-debug-gui   |
-| PETSc Release | release-petsc | -                |
-| PETSc Debug   | debug-petsc   | -                |
+| PETSc Release[^2] | release-petsc | -                |
+| PETSc Debug[^2]   | debug-petsc   | -                |
 
 <!-- vale on -->
 
 [^1]: Requires the `ninja`-tool. See [install instructions]({{< ref "prerequisites.md#optional-install-ninja" >}}).
+[^2]: Requires the `pkg-config`-tool. Can be installed via e.g. `apt` or `brew`.
 
 ### Configure with a preset
 
diff --git a/web/content/docs/devguide/getting-started/build-configuration_for_MPI_PETSc/configure_for_mpi_and_petsc.md b/web/content/docs/devguide/getting-started/build-configuration_for_MPI_PETSc/configure_for_mpi_and_petsc.md
index 13a13c06461af9fa689eac85c68b86134c6f0113..7c5b52f21121ff6f7c854e4308d95a34a8b293d3 100644
--- a/web/content/docs/devguide/getting-started/build-configuration_for_MPI_PETSc/configure_for_mpi_and_petsc.md
+++ b/web/content/docs/devguide/getting-started/build-configuration_for_MPI_PETSc/configure_for_mpi_and_petsc.md
@@ -32,6 +32,15 @@ After setting up WSL, please follow the Linux tab in this guide.
 
 Before continuing with this guide, please follow all steps from the "Developer guide" articles: [Set Up Prerequisites]({{< ref "prerequisites" >}}) and [Get the source code]({{< ref "get-the-source-code" >}}).
 
+### Install `pkg-config`
+
+Is used for finding the PETSc installation. Can be installed via e.g. `apt` or `brew`:
+
+```bash
+apt-get install pkg-config # Linux
+brew install pkg-config    # macOS
+```
+
 ### Install MPI
 
 <div class='win'>