diff --git a/cmake/Modules/VersionConfig.cmake b/cmake/Modules/VersionConfig.cmake
index 36b34f992..b1d5dd1b9 100644
--- a/cmake/Modules/VersionConfig.cmake
+++ b/cmake/Modules/VersionConfig.cmake
@@ -105,12 +105,14 @@ set(BUILD_NUMBER_CACHE
     CACHE INTERNAL "OBS build number cache file")
 
 # Read build number from cache file or manual override
-if(NOT DEFINED OBS_BUILD_NUMBER AND EXISTS ${BUILD_NUMBER_CACHE})
-  file(READ ${BUILD_NUMBER_CACHE} OBS_BUILD_NUMBER)
-  math(EXPR OBS_BUILD_NUMBER "${OBS_BUILD_NUMBER}+1")
-elseif(NOT DEFINED OBS_BUILD_NUMBER)
-  set(OBS_BUILD_NUMBER "1")
+if(NOT DEFINED OBS_BUILD_NUMBER)
+  if(EXISTS ${BUILD_NUMBER_CACHE})
+    file(READ ${BUILD_NUMBER_CACHE} OBS_BUILD_NUMBER)
+    math(EXPR OBS_BUILD_NUMBER "${OBS_BUILD_NUMBER}+1")
+  else()
+    set(OBS_BUILD_NUMBER "1")
+  endif()
+  file(WRITE ${BUILD_NUMBER_CACHE} "${OBS_BUILD_NUMBER}")
 endif()
-file(WRITE ${BUILD_NUMBER_CACHE} "${OBS_BUILD_NUMBER}")
 
 message(STATUS "OBS:  Application Version: ${OBS_VERSION} - Build Number: ${OBS_BUILD_NUMBER}")
diff --git a/cmake/common/buildnumber.cmake b/cmake/common/buildnumber.cmake
index 4d509adc1..ef60952bb 100644
--- a/cmake/common/buildnumber.cmake
+++ b/cmake/common/buildnumber.cmake
@@ -8,14 +8,16 @@ set(_BUILD_NUMBER_CACHE
     CACHE INTERNAL "OBS build number cache file")
 
 # Read build number from cache file or manual override
-if(NOT DEFINED OBS_BUILD_NUMBER AND EXISTS "${_BUILD_NUMBER_CACHE}")
-  file(READ "${_BUILD_NUMBER_CACHE}" OBS_BUILD_NUMBER)
-  math(EXPR OBS_BUILD_NUMBER "${OBS_BUILD_NUMBER}+1")
-elseif(NOT DEFINED OBS_BUILD_NUMBER)
-  if("$ENV{CI}" AND "$ENV{GITHUB_RUN_ID}")
-    set(OBS_BUILD_NUMBER "$ENV{GITHUB_RUN_ID}")
+if(NOT DEFINED OBS_BUILD_NUMBER)
+  if(EXISTS "${_BUILD_NUMBER_CACHE}")
+    file(READ "${_BUILD_NUMBER_CACHE}" OBS_BUILD_NUMBER)
+    math(EXPR OBS_BUILD_NUMBER "${OBS_BUILD_NUMBER}+1")
   else()
-    set(OBS_BUILD_NUMBER "1")
+    if("$ENV{CI}" AND "$ENV{GITHUB_RUN_ID}")
+      set(OBS_BUILD_NUMBER "$ENV{GITHUB_RUN_ID}")
+    else()
+      set(OBS_BUILD_NUMBER "1")
+    endif()
   endif()
+  file(WRITE "${_BUILD_NUMBER_CACHE}" "${OBS_BUILD_NUMBER}")
 endif()
-file(WRITE "${_BUILD_NUMBER_CACHE}" "${OBS_BUILD_NUMBER}")