diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97b1b2a0..69c3d8f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,6 +301,9 @@ else()
   endif()
 endif()
 
+include(BuildType)
+set_build_type()
+
 # Configuration files
 configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
 configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
@@ -559,6 +562,3 @@ add_custom_command(
   POST_BUILD
   COMMAND ${CMAKE_SIZE} ${OBSW_BIN_NAME}${FILE_SUFFIX}
   COMMENT ${POST_BUILD_COMMENT})
-
-include(BuildType)
-set_build_type()
diff --git a/bsp_q7s/OBSWConfig.h.in b/bsp_q7s/OBSWConfig.h.in
index 5dff001c..be5c7dc9 100644
--- a/bsp_q7s/OBSWConfig.h.in
+++ b/bsp_q7s/OBSWConfig.h.in
@@ -10,6 +10,8 @@
 #include "q7sConfig.h"
 #include "OBSWVersion.h"
 
+#cmakedefine RELEASE_BUILD
+
 /*******************************************************************/
 /** All of the following flags should be enabled for mission code  */
 /*******************************************************************/
diff --git a/cmake/BuildType.cmake b/cmake/BuildType.cmake
index e078e5c7..ee027d13 100644
--- a/cmake/BuildType.cmake
+++ b/cmake/BuildType.cmake
@@ -21,10 +21,13 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 	)
 endif()
 
+set(RELEASE_BUILD 1 PARENT_SCOPE)
+
 if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
 	message(STATUS 
 		"Building Debug application with flags: ${CMAKE_C_FLAGS_DEBUG}"
 	)
+	set(RELEASE_BUILD 0 PARENT_SCOPE)
 elseif(${CMAKE_BUILD_TYPE} MATCHES "RelWithDebInfo")
 	message(STATUS 
 		"Building Release (Debug) application with "