diff --git a/.gitmodules b/.gitmodules
index 1cc94fa678b985b8d4d6f5b8f74d07302a10cfe0..6673c74f9a2765b1d2f6d5b6259fcf58a3feb784 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "ThirdParty/SwmmInterface"]
 	path = ThirdParty/SwmmInterface
 	url = https://github.com/ufz/SwmmInterface.git
-[submodule "ThirdParty/MGIS"]
-	path = ThirdParty/MGIS
-	url = https://github.com/ufz/MFrontGenericInterfaceSupport.git
 [submodule "ThirdParty/container-maker"]
 	path = ThirdParty/container-maker
 	url = https://gitlab.opengeosys.org/ogs/container-maker.git
diff --git a/MaterialLib/SolidModels/MFront/CMakeLists.txt b/MaterialLib/SolidModels/MFront/CMakeLists.txt
index 8078835707f0a3b9c7fefa9ee41a73234383b283..3e82944b161b1fce0a6a3c38be19d1bc162b60a8 100644
--- a/MaterialLib/SolidModels/MFront/CMakeLists.txt
+++ b/MaterialLib/SolidModels/MFront/CMakeLists.txt
@@ -4,8 +4,6 @@ list(APPEND SOURCES MFront.cpp MFront.h)
 
 ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES})
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-                      "${PROJECT_SOURCE_DIR}/ThirdParty/MGIS")
 mfront_behaviours_check_library(
     OgsMFrontBehaviour
     BDT
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index b3080d6eab3395ea87e38a20687f343d26a12e77..03584ee1771077d31fa5a809d2bb5aceb1cb949f 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -1,13 +1,3 @@
-# MFrontGenericInterfaceSupport
-if (OGS_USE_MFRONT)
-    set(enable-doxygen-doc OFF CACHE INTERNAL "")
-    set(enable-fortran-bindings OFF CACHE INTERNAL "")
-    set(CMAKE_CXX_STANDARD 11)
-    add_subdirectory(MGIS)
-    set(CMAKE_CXX_STANDARD 17)
-    list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface)
-endif()
-
 # VtkFbxConverter
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VtkFbxConverter/CMakeLists.txt
     AND OGS_USE_OPTIONAL_SUBMODULES)
diff --git a/ThirdParty/MGIS b/ThirdParty/MGIS
deleted file mode 160000
index 56c5e35fb571d992714e663c6bf61ad5354ba296..0000000000000000000000000000000000000000
--- a/ThirdParty/MGIS
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 56c5e35fb571d992714e663c6bf61ad5354ba296
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 354fc3e52602a04f0bb2b1612fdb9af1c1ba4ba9..2a494f5bd4bdc656e5c3fe741afacf512a648657 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -109,6 +109,21 @@ if(Eigen3_ADDED)
     target_include_directories(Eigen3::Eigen SYSTEM INTERFACE ${Eigen3_SOURCE_DIR})
 endif()
 
+if(OGS_USE_MFRONT)
+    CPMAddPackage(
+        NAME MGIS
+        GITHUB_REPOSITORY ufz/MFrontGenericInterfaceSupport
+        GIT_TAG 56c5e35fb571d992714e663c6bf61ad5354ba296
+        OPTIONS
+            "enable-doxygen-doc OFF"
+            "enable-fortran-bindings OFF"
+    )
+    if(MGIS_ADDED)
+        set_target_properties(MFrontGenericInterface PROPERTIES CXX_STANDARD 11)
+        list(APPEND DISABLE_WARNINGS_TARGETS MFrontGenericInterface)
+    endif()
+endif()
+
 # Disable warnings
 foreach(TARGET ${DISABLE_WARNINGS_TARGETS})
     target_compile_options(${TARGET} PRIVATE
diff --git a/scripts/cmake/SubmoduleSetup.cmake b/scripts/cmake/SubmoduleSetup.cmake
index cd7c41079e1ca41c6c0f3aac80edd271433ab4a4..ae47b74e90dd36393c3d58c09451074674ec1bd5 100644
--- a/scripts/cmake/SubmoduleSetup.cmake
+++ b/scripts/cmake/SubmoduleSetup.cmake
@@ -9,9 +9,6 @@ endif()
 if(OGS_BUILD_SWMM)
     list(APPEND REQUIRED_SUBMODULES ThirdParty/SwmmInterface)
 endif()
-if (OGS_USE_MFRONT)
-    list(APPEND REQUIRED_SUBMODULES ThirdParty/MGIS)
-endif()
 
 execute_process(
     COMMAND ${GIT_EXECUTABLE} submodule status