diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba982468..3d9275bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ change warranting a new major release:
 - CFDP Funnel bugfix: CCSDS wrapping was buggy and works properly now.
 - PDEC: Some adaptions to prevent task lockups on invalid FAR states.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/393
+- CMakeLists.txt fix which broke CI/CD builds when server could not retrieve full git SHA.
 
 ## Changed
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 895034c8..49a072f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,25 +175,11 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
     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()
-    if(NOT OBSW_VERSION_MINOR)
-      set(FSFW_SUBVERSION ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
-    endif()
-    if(NOT OBSW_VERSION_REVISION)
-      set(FSFW_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
-    endif()
     set(GIT_VER_HANDLING_OK TRUE)
   else()
     set(GIT_VER_HANDLING_OK FALSE)
   endif()
 endif()
-if(NOT GIT_VER_HANDLING_OK)
-  set(OBSW_VERSION_MAJOR ${OBSW_VERSION_MAJOR_IF_GIT_FAILS})
-  set(OBSW_VERSION_MINOR ${OBSW_VERSION_MINOR_IF_GIT_FAILS})
-  set(OBSW_VERSION_REVISION ${OBSW_VERSION_REVISION_IF_GIT_FAILS})
-endif()
 
 # Set names and variables
 set(OBSW_NAME ${CMAKE_PROJECT_NAME})