diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9393743..33c6edfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ set(MISSION_PATH mission)
 set(TEST_PATH test/testtasks)
 set(LINUX_PATH linux)
 set(COMMON_PATH common)
+set(COMMON_CONFIG_PATH ${COMMON_PATH}/config)
 
 set(FSFW_HAL_LIB_PATH fsfw_hal)
 set(CSP_LIB_PATH ${THIRD_PARTY_FOLDER}/libcsp)
@@ -95,8 +96,21 @@ else()
     set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
 endif()
 
+# Configuration files
+configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
+configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
+configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
+if(${TGT_BSP} MATCHES "arm/q7s")
+    configure_file(${BSP_PATH}/boardconfig/q7sConfig.h.in q7sConfig.h)
+elseif(${TGT_BSP} MATCHES "arm/raspberrypi")
+    configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h)
+endif()
+
 # Set common config path for FSFW
-set(FSFW_ADDITIONAL_INC_PATHS "${COMMON_PATH}/config")
+set(FSFW_ADDITIONAL_INC_PATHS 
+    "${COMMON_PATH}/config"
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
 # Set for lwgps library
 set(LWGPS_CONFIG_PATH "${COMMON_PATH}/config")
 
@@ -157,6 +171,7 @@ endif()
 target_include_directories(${TARGET_NAME} PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${FSFW_CONFIG_PATH}
+	${CMAKE_CURRENT_BINARY_DIR}
 )	
 
 
diff --git a/bsp_hosted/fsfwconfig/FSFWConfig.h b/bsp_hosted/fsfwconfig/FSFWConfig.h.in
similarity index 100%
rename from bsp_hosted/fsfwconfig/FSFWConfig.h
rename to bsp_hosted/fsfwconfig/FSFWConfig.h.in
diff --git a/bsp_hosted/fsfwconfig/OBSWConfig.h b/bsp_hosted/fsfwconfig/OBSWConfig.h.in
similarity index 100%
rename from bsp_hosted/fsfwconfig/OBSWConfig.h
rename to bsp_hosted/fsfwconfig/OBSWConfig.h.in
diff --git a/bsp_linux_board/boardconfig/CMakeLists.txt b/bsp_linux_board/boardconfig/CMakeLists.txt
index c32b326d..67fbaf88 100644
--- a/bsp_linux_board/boardconfig/CMakeLists.txt
+++ b/bsp_linux_board/boardconfig/CMakeLists.txt
@@ -5,6 +5,3 @@ target_sources(${TARGET_NAME} PRIVATE
 target_include_directories(${TARGET_NAME} PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
-
-
-
diff --git a/bsp_linux_board/boardconfig/rpi_config.h b/bsp_linux_board/boardconfig/rpiConfig.h.in
similarity index 100%
rename from bsp_linux_board/boardconfig/rpi_config.h
rename to bsp_linux_board/boardconfig/rpiConfig.h.in
diff --git a/bsp_q7s/boardconfig/CMakeLists.txt b/bsp_q7s/boardconfig/CMakeLists.txt
index c32b326d..67fbaf88 100644
--- a/bsp_q7s/boardconfig/CMakeLists.txt
+++ b/bsp_q7s/boardconfig/CMakeLists.txt
@@ -5,6 +5,3 @@ target_sources(${TARGET_NAME} PRIVATE
 target_include_directories(${TARGET_NAME} PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
-
-
-
diff --git a/bsp_q7s/boardconfig/q7s_config.h b/bsp_q7s/boardconfig/q7sConfig.h.in
similarity index 100%
rename from bsp_q7s/boardconfig/q7s_config.h
rename to bsp_q7s/boardconfig/q7sConfig.h.in
diff --git a/common/config/commonConfig.h b/common/config/commonConfig.h.in
similarity index 100%
rename from common/config/commonConfig.h
rename to common/config/commonConfig.h.in
diff --git a/linux/fsfwconfig/FSFWConfig.h b/linux/fsfwconfig/FSFWConfig.h.in
similarity index 100%
rename from linux/fsfwconfig/FSFWConfig.h
rename to linux/fsfwconfig/FSFWConfig.h.in
diff --git a/linux/fsfwconfig/OBSWConfig.h b/linux/fsfwconfig/OBSWConfig.h.in
similarity index 97%
rename from linux/fsfwconfig/OBSWConfig.h
rename to linux/fsfwconfig/OBSWConfig.h.in
index c4441eef..82a57e39 100644
--- a/linux/fsfwconfig/OBSWConfig.h
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -7,9 +7,9 @@
 #define FSFWCONFIG_OBSWCONFIG_H_
 
 #ifdef RASPBERRY_PI
-#include <rpi_config.h>
+#include "rpiConfig.h"
 #elif defined(XIPHOS_Q7S)
-#include <q7s_config.h>
+#include "q7sConfig.h"
 #endif
 #include "commonConfig.h"
 #include "OBSWVersion.h"
diff --git a/misc/archive/GPIORPi.cpp b/misc/archive/GPIORPi.cpp
index 74b67a42..34d0f69a 100644
--- a/misc/archive/GPIORPi.cpp
+++ b/misc/archive/GPIORPi.cpp
@@ -1,7 +1,6 @@
 #include "GPIORPi.h"
-#include <FSFWConfig.h>
-
 #include <fsfw/serviceinterface/ServiceInterface.h>
+#include <linux/fsfwconfig/FSFWConfig.h.in>
 #include <linux/gpio/GpioCookie.h>
 
 ReturnValue_t gpio::createRpiGpioConfig(GpioCookie* cookie, gpioId_t gpioId, int bcmPin,