diff --git a/.github/workflows/ci-workable.yaml b/.github/workflows/ci-workable.yaml
index 468dd8fe44..2c069f7062 100644
--- a/.github/workflows/ci-workable.yaml
+++ b/.github/workflows/ci-workable.yaml
@@ -43,11 +43,14 @@ jobs:
       - name: set the build branch
         id: set-branch
         shell: bash
+        env:
+          MANUAL_BUILD_BRANCH: ${{ inputs.manual_build_branch }}
+          REF_NAME: ${{ github.ref_name }}
         run: |
-          if [[ "${{ inputs.manual_build_branch }}" == "" ]]; then
-            ACTUAL_BRANCH=${{ github.ref_name }}
+          if [[ "$MANUAL_BUILD_BRANCH" == "" ]]; then
+            ACTUAL_BRANCH=$REF_NAME
           else
-            ACTUAL_BRANCH=${{ inputs.manual_build_branch }}
+            ACTUAL_BRANCH=$MANUAL_BUILD_BRANCH
           fi
           echo "ref-for-name=${ACTUAL_BRANCH#workable_feature/*}" >> $GITHUB_OUTPUT
           echo "ref-for-checkout=$ACTUAL_BRANCH" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/common_image_tagging_workflow.yaml b/.github/workflows/common_image_tagging_workflow.yaml
index bc9ecc26b2..f93c3fb892 100644
--- a/.github/workflows/common_image_tagging_workflow.yaml
+++ b/.github/workflows/common_image_tagging_workflow.yaml
@@ -40,11 +40,14 @@ jobs:
       - name: set image tag
         id: set-tag
         shell: bash
+        env:
+          INPUT_TAG: ${{ inputs.tag }}
+          INPUT_REF: ${{ inputs.ref }}
         run: |
-          if [[ "${{ inputs.tag }}" == "" ]]; then
-            FINAL_TAG=${{ inputs.ref }}-${GITHUB_SHA::7}-ts.$(date +%s)
+          if [[ "$INPUT_TAG" == "" ]]; then
+            FINAL_TAG=$INPUT_REF-${GITHUB_SHA::7}-ts.$(date +%s)
           else
-            FINAL_TAG=${{ inputs.tag }}
+            FINAL_TAG=$INPUT_TAG
           fi
           echo "Using tag: $FINAL_TAG"
           echo "tag=$FINAL_TAG" >> $GITHUB_OUTPUT