diff --git a/.cmake/Version.cmake b/.cmake/Version.cmake
index 7a51f392..46ff4641 100644
--- a/.cmake/Version.cmake
+++ b/.cmake/Version.cmake
@@ -30,7 +30,7 @@ endif()
     
 # Git describe
 # @note Exclude 'tweak' tags in the form v0.1.2-30 i.e. with the '-30' to avoid a second suffix being appended e.g v0.1.2-30-12
-set(GIT_VERSION_COMMAND "${GIT_EXECUTABLE}" -C "${VERSION_SOURCE_DIR}" --no-pager describe --tags --exclude "v[0-9]*[._][0-9]*[._][0-9]*-[0-9]*|nightly.*" --always --dirty --long)
+set(GIT_VERSION_COMMAND "${GIT_EXECUTABLE}" -C "${VERSION_SOURCE_DIR}" --no-pager describe --tags --exclude "v[0-9]*[._][0-9]*[._][0-9]*-[0-9]*" --exclude "nightly*" --always --dirty --long)
 
 # Git count
 # @note We only count commits on the current branch and not comits in merge branches via '--first-parent'. The count is never unique but the Sha will be!
@@ -235,4 +235,4 @@ if ( NOT _VERSION_NOT_GIT_REPO )
     endif()
 else()
     message(CHECK_FAIL "Failed, Error reading Git repository")
-endif()
\ No newline at end of file
+endif()
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d9e082d9..da0e3d39 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -502,7 +502,7 @@ jobs:
 
       - name: Release (GitHub)
         uses: ncipollo/release-action@v1
-        if: github.event_name == 'push' && github.ref_type == 'tag'
+        if: github.ref_type == 'tag'
         with:
           artifacts: ./artifacts/*
           allowUpdates: true