diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 207ab0bc4..b8e76c69f 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -77,11 +77,14 @@
             exit 1
         
         - name: Logging & summaries
+          env:
+            INPUT_PR_NUMBER: ${{ inputs.PR_NUMBER }}
+            INPUT_PR_NUMBER_OR_DEFAULT: ${{ inputs.PR_NUMBER || 'not a PR' }}
           run: |
             echo "::group::Logging" 
             echo "🎯 github trigger event name: ${{ github.event_name }}"
             echo "is_PR: ${{ inputs.is_PR }} "
-            echo "PR_NUMBER: ${{ inputs.PR_NUMBER }}" 
+            echo "PR_NUMBER: $INPUT_PR_NUMBER" 
             echo "env: STORE_FILE_PATH: ${{ env.STORE_FILE_PATH }}" 
             echo "env: BUILD_JSON_PATH: ${{ env.BUILD_JSON_PATH }}" 
             echo "env: VERSION_LABEL: ${{ env. VERSION_LABEL }}"
@@ -93,7 +96,7 @@
             
             echo "## 🚀 Build Type: ${{ env.VERSION_LABEL }}" >> $GITHUB_STEP_SUMMARY
             echo "is_PR: ${{ inputs.is_PR || 'NOT a PR' }}" >> $GITHUB_STEP_SUMMARY
-            echo "PR_NUMBER: ${{ inputs.PR_NUMBER || 'not a PR' }}" >> $GITHUB_STEP_SUMMARY
+            echo "PR_NUMBER: $INPUT_PR_NUMBER_OR_DEFAULT" >> $GITHUB_STEP_SUMMARY
             echo "should not skip tags, releases: ${{ ! inputs.skip_tagging_and_releases }}" >> $GITHUB_STEP_SUMMARY     
 
         - name: Checkout Repository
@@ -143,11 +146,13 @@
             echo "Extracted Version: $VERSION"
 
         - name: Append Commit Hash to Version and Update config.xml
-          id: update-version 
+          id: update-version
+          env:
+            INPUT_PR_NUMBER: ${{ inputs.PR_NUMBER }}
           run: |
             SHORT_COMMIT_HASH=$(echo "${{ env.GIT_COMMIT }}" | cut -c 1-7)
             if ${{ inputs.is_PR  || false }}; then 
-              PR_NUMBER=${{ inputs.PR_NUMBER }}
+              PR_NUMBER=$INPUT_PR_NUMBER
             else
               PR_NUMBER=
             fi