diff --git a/bsp_linux_board/InitMission.cpp b/bsp_linux_board/InitMission.cpp
index 40c38e6c..531f9d47 100644
--- a/bsp_linux_board/InitMission.cpp
+++ b/bsp_linux_board/InitMission.cpp
@@ -1,9 +1,9 @@
 #include "InitMission.h"
 #include "ObjectFactory.h"
 
-#include <fsfwconfig/objects/systemObjectList.h>
-#include <fsfwconfig/OBSWConfig.h>
-#include <fsfwconfig/pollingsequence/pollingSequenceFactory.h>
+#include "objects/systemObjectList.h"
+#include "OBSWConfig.h"
+#include "pollingsequence/pollingSequenceFactory.h"
 
 #include <mission/utility/InitMission.h>
 #include <fsfw/objectmanager/ObjectManagerIF.h>
diff --git a/bsp_linux_board/ObjectFactory.cpp b/bsp_linux_board/ObjectFactory.cpp
index 0518ac87..6c195b38 100644
--- a/bsp_linux_board/ObjectFactory.cpp
+++ b/bsp_linux_board/ObjectFactory.cpp
@@ -1,12 +1,12 @@
 #include "ObjectFactory.h"
 
-#include <fsfwconfig/objects/systemObjectList.h>
-#include <fsfwconfig/devices/addresses.h>
-#include <fsfwconfig/devices/gpioIds.h>
-#include <fsfwconfig/OBSWConfig.h>
-#include <fsfwconfig/tmtc/apid.h>
-#include <fsfwconfig/tmtc/pusIds.h>
-#include <fsfwconfig/devices/spi.h>
+#include "objects/systemObjectList.h"
+#include "devices/addresses.h"
+#include "devices/gpioIds.h"
+#include "OBSWConfig.h"
+#include "tmtc/apid.h"
+#include "tmtc/pusIds.h"
+#include "devices/spi.h"
 
 #include <linux/boardtest/LibgpiodTest.h>
 #include <linux/boardtest/SpiTestClass.h>
@@ -56,9 +56,7 @@ void ObjectFactory::produce(){
     Factory::setStaticFrameworkObjectIds();
     ObjectFactory::produceGenericObjects();
 
-    new UdpTmTcBridge(objects::UDP_BRIDGE,
-            objects::CCSDS_PACKET_DISTRIBUTOR,
-            objects::TM_STORE, objects::TC_STORE);
+    new UdpTmTcBridge(objects::UDP_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
     new UdpTcPollingTask(objects::UDP_POLLING_TASK, objects::UDP_BRIDGE);
 
     GpioIF* gpioIF = new LinuxLibgpioIF(objects::GPIO_IF);