diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index b1783054..6c176eb1 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -4,7 +4,7 @@
 
 #include "OBSWConfig.h"
 #include "OBSWVersion.h"
-#include "fsfw/FSFWVersion.h"
+#include "fsfw/version.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/timemanager/Stopwatch.h"
 #include "watchdogConf.h"
@@ -624,9 +624,9 @@ ReturnValue_t CoreController::initVersionFile() {
   std::string fullObswVersionString = "OBSW: v" + std::to_string(SW_VERSION) + "." +
                                       std::to_string(SW_SUBVERSION) + "." +
                                       std::to_string(SW_REVISION);
-  std::string fullFsfwVersionString = "FSFW: v" + std::to_string(FSFW_VERSION) + "." +
-                                      std::to_string(FSFW_SUBVERSION) + "." +
-                                      std::to_string(FSFW_REVISION);
+  char versionString[16] = {};
+  fsfw::FSFW_VERSION.getVersion(versionString, sizeof(versionString));
+  std::string fullFsfwVersionString = "FSFW: v" + std::string(versionString);
   std::string systemString = "System: " + unameLine;
   std::string mountPrefix = SdCardManager::instance()->getCurrentMountPrefix();
   std::string versionFilePath = mountPrefix + VERSION_FILE;
diff --git a/bsp_q7s/core/obsw.cpp b/bsp_q7s/core/obsw.cpp
index ca7271ce..197ca66b 100644
--- a/bsp_q7s/core/obsw.cpp
+++ b/bsp_q7s/core/obsw.cpp
@@ -14,7 +14,6 @@ static int OBSW_ALREADY_RUNNING = -2;
 
 int obsw::obsw() {
   using namespace fsfw;
-  fsfw::getVersion(version);
   std::cout << "-- EIVE OBSW --" << std::endl;
 #if BOARD_TE0720 == 0
   std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
@@ -22,8 +21,7 @@ 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.major << "." << FSFW_VERSION.minor << "." << FSFW_VERSION.revision
-            << "--" << std::endl;
+            << FSFW_VERSION << "--" << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
 
 #if Q7S_CHECK_FOR_ALREADY_RUNNING_IMG == 1