diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp
index 04163a82..4b0639f7 100644
--- a/bsp_q7s/core/obsw.cpp
+++ b/bsp_q7s/core/obsw.cpp
@@ -6,13 +6,15 @@
 #include "InitMission.h"
 #include "OBSWConfig.h"
 #include "OBSWVersion.h"
-#include "fsfw/FSFWVersion.h"
 #include "fsfw/tasks/TaskFactory.h"
+#include "fsfw/version.h"
 #include "watchdogConf.h"
 
 static int OBSW_ALREADY_RUNNING = -2;
 
 int obsw::obsw() {
+  fsfw::Version version;
+  fsfw::getVersion(version);
   std::cout << "-- EIVE OBSW --" << std::endl;
 #if BOARD_TE0720 == 0
   std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
@@ -20,7 +22,8 @@ int obsw::obsw() {
   std::cout << "-- Compiled for Linux (TE0720) --" << std::endl;
 #endif
   std::cout << "-- OBSW v" << SW_VERSION << "." << SW_SUBVERSION << "." << SW_REVISION << ", FSFW v"
-            << FSFW_VERSION << "." << FSFW_SUBVERSION << "." << FSFW_REVISION << "--" << std::endl;
+            << version.major << "." << version.minor << "." << version.revision << "--"
+            << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
 
 #if Q7S_CHECK_FOR_ALREADY_RUNNING_IMG == 1
diff --git a/bsp_q7s/devices/PlocSupervisorHandler.h b/bsp_q7s/devices/PlocSupervisorHandler.h
index 1a77af6a..b85b8ace 100644
--- a/bsp_q7s/devices/PlocSupervisorHandler.h
+++ b/bsp_q7s/devices/PlocSupervisorHandler.h
@@ -1,11 +1,11 @@
 #ifndef MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 
-#include "OBSWConfig.h"
 #include <bsp_q7s/memory/SdCardManager.h>
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <fsfw_hal/linux/uart/UartComIF.h>
 
+#include "OBSWConfig.h"
 #include "devicedefinitions/PlocSupervisorDefinitions.h"
 
 /**
diff --git a/bsp_q7s/memory/SdCardManager.cpp b/bsp_q7s/memory/SdCardManager.cpp
index b76cee12..b336b84c 100644
--- a/bsp_q7s/memory/SdCardManager.cpp
+++ b/bsp_q7s/memory/SdCardManager.cpp
@@ -1,6 +1,5 @@
 #include "SdCardManager.h"
 
-#include "OBSWConfig.h"
 #include <fsfw/ipc/MutexGuard.h>
 #include <fsfw/timemanager/Countdown.h>
 #include <unistd.h>
@@ -10,6 +9,7 @@
 #include <fstream>
 #include <memory>
 
+#include "OBSWConfig.h"
 #include "common/config/commonObjects.h"
 #include "fsfw/ipc/MutexFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
diff --git a/fsfw b/fsfw
index 84f95e8d..3b497dbb 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 84f95e8d7641be7a83faf1cbee718c6cc5de152d
+Subproject commit 3b497dbb8dae77f1cf28f50f7ba770c4256acd2d