diff --git a/CMakeLists.txt b/CMakeLists.txt
index dadf7234..b959b5a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,12 @@ endif()
 include(${CMAKE_SCRIPT_PATH}/PreProjectConfig.cmake)
 pre_project_config()
 
+# Check whether the user has already installed Catch2 first. This has to come before
+# the project call. We could also exlcude doing this when the Q7S primary OBSW is built..
+find_package(Catch2 3 CONFIG QUIET)
+
 # Project Name
-project(eive-obsw ASM C CXX)
+project(eive-obsw)
 
 ################################################################################
 # Pre-Sources preparation
@@ -196,8 +200,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 	set(COMPILER_FLAGS "/permissive-")
 endif()
 
-# Check whether the user has already installed Catch2 first
-find_package(Catch2 3 QUIET)
 
 # Not installed, so use FetchContent to download and provide Catch2
 if(NOT Catch2_FOUND)