diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49647a11..ee958033 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,10 @@
 ################################################################################
 cmake_minimum_required(VERSION 3.13)
 
+set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 0)
+set(OBSW_VERSION_MINOR_IF_GIT_FAILS 0)
+set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
+
 # set(CMAKE_VERBOSE TRUE)
 
 option(EIVE_HARDCODED_TOOLCHAIN_FILE "\
@@ -16,20 +20,8 @@ For Linux Board Target BSPs, a default toolchain file will be set. Should be set
 if a different toolchain file is set externally" ON
 )
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-# Perform steps like loading toolchain files where applicable.
-include(PreProjectConfig)
-pre_project_config()
-
-# Project Name
-project(eive-obsw)
-
-set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 0)
-set(OBSW_VERSION_MINOR_IF_GIT_FAILS 0)
-set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
-
 if(NOT FSFW_OSAL)
-	set(FSFW_OSAL linux CACHE STRING "OS for the FSFW.")
+    set(FSFW_OSAL linux CACHE STRING "OS for the FSFW.")
 endif()
 
 if(TGT_BSP)
@@ -44,6 +36,18 @@ else()
     option(EIVE_CREATE_UNIQUE_OBSW_BIN "Append username to generated binary name" OFF)
 endif()
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+# Perform steps like loading toolchain files where applicable.
+include(PreProjectConfig)
+pre_project_config()
+
+# Project Name
+project(eive-obsw)
+
+# Specify the C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
 include(EiveHelpers)
 
 option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
@@ -56,10 +60,6 @@ set(OBSW_DEBUG_STARTRACKER 0)
 # Pre-Sources preparation
 ################################################################################
 
-# Specify the C++ standard
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
-
 # Version handling
 set(GIT_VER_HANDLING_OK FALSE)
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)