diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31c95b47..38a7441b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,10 @@ change warranting a new major release:
 
 ## Fixed
 
+- Build system: Fixed small bug, where the version itself was
+  stored as the git SHA hash in `commonConfig.h`. This will be
+  an empty string now for regular versions.
+- Bump FSFW for important fix in PUS mode service.
 - Bugfixes in 'SensofProcessing' where previously MGM values would be calibrated before being
   transformed in body RF. However, the calibration values are in the body RF. Also fixed the
   validity flag of 'mgmVecTotDerivative'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97b1b2a0..25e63e69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,7 +171,10 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
     list(GET GIT_INFO 1 OBSW_VERSION_MAJOR)
     list(GET GIT_INFO 2 OBSW_VERSION_MINOR)
     list(GET GIT_INFO 3 OBSW_VERSION_REVISION)
-    list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
+    list(LENGTH GIT_INFO LIST_LEN)
+    if(LIST_LEN GREATER 4)
+        list(GET GIT_INFO 4 OBSW_VERSION_CST_GIT_SHA1)
+    endif()
     if(NOT OBSW_VERSION_MAJOR)
       set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
     endif()
diff --git a/cmake/EiveHelpers.cmake b/cmake/EiveHelpers.cmake
index 1a717552..b210739e 100644
--- a/cmake/EiveHelpers.cmake
+++ b/cmake/EiveHelpers.cmake
@@ -4,7 +4,7 @@
 # 2. Major version
 # 3. Minor version
 # 4. Revision
-# 5. git SHA hash and commits since tag
+# 5. (Optional) git SHA hash and commits since tag when applicable
 function(determine_version_with_git)
     include(GetGitRevisionDescription)
     git_describe(VERSION ${ARGN})
@@ -22,7 +22,9 @@ function(determine_version_with_git)
     list(APPEND GIT_INFO ${_VERSION_MAJOR})
     list(APPEND GIT_INFO ${_VERSION_MINOR})
     list(APPEND GIT_INFO ${_VERSION_PATCH})
-    list(APPEND GIT_INFO ${VERSION_SHA1})
+    if(NOT VERSION_SHA1 STREQUAL VERSION)
+        list(APPEND GIT_INFO ${VERSION_SHA1})
+    endif()
     set(GIT_INFO ${GIT_INFO} PARENT_SCOPE)
     message(STATUS "eive | Set git version info into GIT_INFO from the git tag ${VERSION}")
 endfunction()
diff --git a/fsfw b/fsfw
index 38789e05..84dc7ac0 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 38789e053b65cfa14604fc625e7bcc8ca03a3f17
+Subproject commit 84dc7ac0ce4f16d93a6a5a5fcd453b2fde206dba
diff --git a/tmtc b/tmtc
index d6445d38..f16e27b7 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit d6445d38a8eb644a5e1bd27f0fc56d29e93c030d
+Subproject commit f16e27b79b9996f5a6c246cea560b783eb566d7e