diff --git a/CMakeLists.txt b/CMakeLists.txt
index 499196a7f..eedc95c9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,9 +94,6 @@ set(FW_COMMIT_HASH "0") # Clear it, the code expects a binary...
 set(PROJECT_VERSION_TIMESTAMP "0")
 endif()
 
-#Rewrite to remove leading v, or set it entirely if the data came from Configuration.h
-set(PROJECT_VERSION_FULL "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_REV}-${PROJECT_VERSION_FLV}${PROJECT_VERSION_FLV_VER}-${PROJECT_VERSION_COMMIT}")
-
 # Language configuration
 set(MAIN_LANGUAGES
     cs de es fr it pl
@@ -370,7 +367,7 @@ function(add_base_binary variant_name)
   target_compile_definitions(
     ${variant_name}
     PRIVATE CMAKE_CONTROL FW_REPOSITORY="${PROJECT_REPOSITORY}"
-            FW_VERSION_FULL="${PROJECT_VERSION_FULL}" FW_COMMIT_HASH=0x${FW_COMMIT_HASH}
+            FW_COMMIT_HASH=0x${FW_COMMIT_HASH}
             FW_MAJOR=${PROJECT_VERSION_MAJOR}
             FW_MINOR=${PROJECT_VERSION_MINOR}
             FW_REVISION=${PROJECT_VERSION_REV}
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
index 4b52f2049..1b4b04cfc 100644
--- a/Firmware/Configuration.h
+++ b/Firmware/Configuration.h
@@ -30,10 +30,12 @@ extern const char _sPrinterMmuName[] PROGMEM;
 #ifndef FW_FLAVOR
     #define FW_TWEAK (FIRMWARE_REVISION_RELEASED)
     #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION)
+    #define FW_VERSION_FULL STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_COMMITNR)
 #else
     // Construct the TWEAK value as it is expected from the enum.
     #define FW_TWEAK (CONCAT(FIRMWARE_REVISION_,FW_FLAVOR) + FW_FLAVERSION)
     #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
+    #define FW_VERSION_FULL STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) "-" STR(FW_COMMITNR)
 #endif
 
 // The full version string and repository source are set via cmake