diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index d892bc74..116b4fc9 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -185,8 +185,11 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
       uint32_t p2 = 0;
       if (strcmp("", common::OBSW_VERSION_CST_GIT_SHA1) != 0) {
         p1 |= 1;
+        auto shaAsStr = std::string(common::OBSW_VERSION_CST_GIT_SHA1);
+        size_t posDash = shaAsStr.find("-");
+        auto gitHash = shaAsStr.substr(posDash + 2, 4);
         // Only copy first 4 letters of git hash
-        memcpy(&p2, common::OBSW_VERSION_CST_GIT_SHA1 + 3, 4);
+        memcpy(&p2, gitHash.c_str(), 4);
       }
 
       triggerEvent(VERSION_INFO, p1, p2);
diff --git a/tmtc b/tmtc
index dedfe1c9..4086e794 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit dedfe1c977fbe47a2d6a50e56e01eed9fe48b869
+Subproject commit 4086e7947b4458bcbbd47c78e67c23d3a47885c8