diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5dfccb67a..bd69b0835 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -45,6 +45,7 @@ jobs:
       - name: Build firmware ${{ matrix.target }}
         env:
           FLAVOR: ${{ matrix.target }}
+          EDGETX_VERSION_SUFFIX: nightly
         run: ./tools/build-gh.sh
 
       - name: Package firmware ${{ matrix.target }}
diff --git a/tools/build-gh.sh b/tools/build-gh.sh
index 4c0370ccb..94c1baccc 100755
--- a/tools/build-gh.sh
+++ b/tools/build-gh.sh
@@ -48,20 +48,22 @@ fi
 
 : ${SRCDIR:=$(dirname "$(pwd)/$0")/..}
 
-gh_type=$(echo "$GITHUB_REF" | awk -F / '{print $2}') #heads|tags|pull
-
-if [[ $gh_type = "tags" ]]; then
-  # tags: refs/tags/<tag_name>
-  gh_tag=${GITHUB_REF##*/}
-  export EDGETX_VERSION_TAG=$gh_tag
-elif [[ $gh_type = "pull" ]]; then
-  # pull: refs/pull/<pr_number>/merge
-  gh_pull_number=PR$(echo "$GITHUB_REF" | awk -F / '{print $3}')
-  export EDGETX_VERSION_SUFFIX=$gh_pull_number
-elif [[ $gh_type = "heads" ]]; then
-  # heads: refs/heads/<branch_name>
-  gh_branch=${GITHUB_REF##*/}
-  export EDGETX_VERSION_SUFFIX=$gh_branch
+# Generate EDGETX_VERSION_SUFFIX if not already set
+if [[ -z ${EDGETX_VERSION_SUFFIX} ]]; then
+  gh_type=$(echo "$GITHUB_REF" | awk -F / '{print $2}') #heads|tags|pull
+  if [[ $gh_type = "tags" ]]; then
+    # tags: refs/tags/<tag_name>
+    gh_tag=${GITHUB_REF##*/}
+    export EDGETX_VERSION_TAG=$gh_tag
+  elif [[ $gh_type = "pull" ]]; then
+    # pull: refs/pull/<pr_number>/merge
+    gh_pull_number=PR$(echo "$GITHUB_REF" | awk -F / '{print $3}')
+    export EDGETX_VERSION_SUFFIX=$gh_pull_number
+  elif [[ $gh_type = "heads" ]]; then
+    # heads: refs/heads/<branch_name>
+    gh_branch=${GITHUB_REF##*/}
+    export EDGETX_VERSION_SUFFIX=$gh_branch
+  fi
 fi
 
 : ${BUILD_TYPE:=Release}