diff --git a/.github/workflows/push-tag-create-release.yml b/.github/workflows/push-tag-create-release.yml
index f853f9e03a94..072a4f6e01c5 100644
--- a/.github/workflows/push-tag-create-release.yml
+++ b/.github/workflows/push-tag-create-release.yml
@@ -63,7 +63,9 @@ jobs:
         run: echo "TAG_NAME=${GITHUB_REF}" >> $GITHUB_ENV
       - name: Set tag name from manual input
         if: github.event_name == 'workflow_dispatch'
-        run: echo "TAG_NAME=refs/tags/${{ github.event.inputs.tag }}" >> $GITHUB_ENV
+        env:
+          TAG: ${{ github.event.inputs.tag }}
+        run: echo "TAG_NAME=refs/tags/$TAG" >> $GITHUB_ENV
 
       - name: Get release metadata JSON
         run: |
@@ -93,9 +95,11 @@ jobs:
           persist-credentials: false
       - name: Check out tag from manual input
         if: github.event_name == 'workflow_dispatch'
+        env:
+          TAG: ${{ github.event.inputs.tag }}
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # ratchet:actions/checkout@v3
         with:
-          ref: refs/tags/${{ github.event.inputs.tag }}
+          ref: refs/tags/$TAG
           fetch-depth: 0 # all history
           persist-credentials: false
 
diff --git a/.github/workflows/release-approval.yml b/.github/workflows/release-approval.yml
index eb90ca793148..e7d0521c8f1b 100644
--- a/.github/workflows/release-approval.yml
+++ b/.github/workflows/release-approval.yml
@@ -71,9 +71,11 @@ jobs:
 
       ### These steps run on workflow_dispatch event only ###
       - name: "workflow_dispatch: Load PR number"
+        env:
+          PR: ${{ github.event.inputs.pr }}
         id: workflow_dispatch_load_pr
         if: github.event_name == 'workflow_dispatch'
-        run: echo "pr_num=${{ github.event.inputs.pr }}" >> $GITHUB_OUTPUT
+        run: echo "pr_num=$PR" >> $GITHUB_OUTPUT
 
       - name: "workflow_dispatch: Load is_release_branch"
         id: workflow_dispatch_is_release_branch