diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1d305b072d6255ca4556a17f8efddbc586d511c6..d79a385529549557b99747e252f754c8b0f0ea34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,10 +61,10 @@ endif()
 option(OGS_USE_CVODE "Use the Sundials CVODE module?" OFF)
 
 # ---- CMake includes ----
-include(Versions)
 include(GitSetup)
-include(PythonSetup)
 include(SubmoduleSetup)
+include(Versions)
+include(PythonSetup)
 include(ProcessesSetup)
 include(ProjectSetup)
 include(Functions)
diff --git a/scripts/cmake/GitSetup.cmake b/scripts/cmake/GitSetup.cmake
index 6ec1497b2ab1042deea439c0813aa782b39d66c2..e2c844d59ee860cead17749169222b0b1b1ac5e4 100644
--- a/scripts/cmake/GitSetup.cmake
+++ b/scripts/cmake/GitSetup.cmake
@@ -6,7 +6,7 @@ if(DEFINED ENV{OGS_VERSION})
     message(STATUS "OGS VERSION: ${OGS_VERSION} (set via environment)")
 endif()
 
-if(NOT IS_GIT_REPO AND NOT OGS_VERSION)
+if(NOT IS_GIT_REPO)
     execute_process(COMMAND ${GIT_EXECUTABLE} status
         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
         RESULT_VARIABLE IS_GIT_REPO