diff --git a/bsp_q7s/OBSWConfig.h.in b/bsp_q7s/OBSWConfig.h.in
index fe59d8d3..b9c27840 100644
--- a/bsp_q7s/OBSWConfig.h.in
+++ b/bsp_q7s/OBSWConfig.h.in
@@ -37,7 +37,6 @@
 #define OBSW_ADD_RAD_SENSORS                        @OBSW_ADD_RAD_SENSORS@
 #define OBSW_ADD_PL_PCDU                            @OBSW_ADD_PL_PCDU@
 #define OBSW_ADD_SYRLINKS                           @OBSW_ADD_SYRLINKS@
-#define OBSW_ADD_CFDP_COMPONENTS                    1
 #define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
 #define OBSW_MPSOC_JTAG_BOOT                        0
 
diff --git a/common/config/commonConfig.h.in b/common/config/commonConfig.h.in
index 9581e751..1b0111e1 100644
--- a/common/config/commonConfig.h.in
+++ b/common/config/commonConfig.h.in
@@ -25,6 +25,8 @@ debugging. */
 // CCSDS IP Cores. 
 #define OBSW_USE_TMTC_TCP_BRIDGE            1
 
+#define OBSW_ADD_CFDP_COMPONENTS            1
+
 namespace common {
 
 static constexpr uint8_t OBSW_VERSION_MAJOR = @OBSW_VERSION_MAJOR@;