diff --git a/.mokogitea/workflows/auto-release.yml b/.mokogitea/workflows/auto-release.yml
index 4489ae0..fa6eb64 100644
--- a/.mokogitea/workflows/auto-release.yml
+++ b/.mokogitea/workflows/auto-release.yml
@@ -99,9 +99,11 @@ jobs:
           fi
 
       - name: Rename branch to rc
+        env:
+          HEAD_REF: ${{ github.event.pull_request.head.ref || 'dev' }}
         run: |
           php ${MOKO_CLI}/branch_rename.php \
-            --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
+            --from "$HEAD_REF" --to rc \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" \
             --api-base "${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
             --pr "${{ github.event.pull_request.number }}"
@@ -225,10 +227,11 @@ jobs:
 
       - name: "Determine version bump level"
         id: bump
+        env:
+          HEAD_REF: ${{ github.event.pull_request.head.ref || 'dev' }}
         run: |
           # Fix/patch branches: version was already bumped by pre-release, just strip suffix
           # Feature/dev branches: bump minor for the new stable release
-          HEAD_REF="${{ github.event.pull_request.head.ref || 'dev' }}"
           case "$HEAD_REF" in
             fix/*|patch/*|hotfix/*|bugfix/*) BUMP="none" ;;
             *)                               BUMP="minor" ;;
diff --git a/.mokogitea/workflows/branch-cleanup.yml b/.mokogitea/workflows/branch-cleanup.yml
index 9d884e7..4ea4709 100644
--- a/.mokogitea/workflows/branch-cleanup.yml
+++ b/.mokogitea/workflows/branch-cleanup.yml
@@ -30,8 +30,9 @@ jobs:
 
     steps:
       - name: Delete source branch
+        env:
+          BRANCH: ${{ github.event.pull_request.head.ref }}
         run: |
-          BRANCH="${{ github.event.pull_request.head.ref }}"
           API="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}/api/v1/repos/${{ github.repository }}/branches"
           ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
 
diff --git a/.mokogitea/workflows/ci-issue-reporter.yml b/.mokogitea/workflows/ci-issue-reporter.yml
index 7ad19c8..873e3e2 100644
--- a/.mokogitea/workflows/ci-issue-reporter.yml
+++ b/.mokogitea/workflows/ci-issue-reporter.yml
@@ -59,10 +59,14 @@ jobs:
         env:
           MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+          GATE: ${{ inputs.gate }}
+          DETAILS: ${{ inputs.details }}
+          SEVERITY: ${{ inputs.severity }}
+          WORKFLOW: ${{ inputs.workflow }}
         run: |
           chmod +x /tmp/mokocli/cli/ci_issue_reporter.sh
           /tmp/mokocli/cli/ci_issue_reporter.sh \
-            --gate "${{ inputs.gate }}" \
-            --details "${{ inputs.details }}" \
-            --severity "${{ inputs.severity }}" \
-            --workflow "${{ inputs.workflow }}"
+            --gate "$GATE" \
+            --details "$DETAILS" \
+            --severity "$SEVERITY" \
+            --workflow "$WORKFLOW"
diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml
index 11958bd..5ddd539 100644
--- a/.mokogitea/workflows/issue-branch.yml
+++ b/.mokogitea/workflows/issue-branch.yml
@@ -27,11 +27,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Create branch and comment
+        env:
+          ISSUE_TITLE: ${{ github.event.issue.title }}
         run: |
           TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
           API="${MOKOGITEA_URL}/api/v1/repos/${{ github.repository }}"
           ISSUE_NUM="${{ github.event.issue.number }}"
-          ISSUE_TITLE="${{ github.event.issue.title }}"
 
           # Build slug from title: lowercase, replace non-alnum with dash, trim
           SLUG=$(echo "${ISSUE_TITLE}" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//;s/-$//' | cut -c1-40)
diff --git a/.mokogitea/workflows/pr-check.yml b/.mokogitea/workflows/pr-check.yml
index c834bf5..35e2d5a 100644
--- a/.mokogitea/workflows/pr-check.yml
+++ b/.mokogitea/workflows/pr-check.yml
@@ -30,9 +30,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check branch merge target
+        env:
+          HEAD: ${{ github.head_ref }}
+          BASE: ${{ github.base_ref }}
         run: |
-          HEAD="${{ github.head_ref }}"
-          BASE="${{ github.base_ref }}"
 
           echo "PR: ${HEAD} → ${BASE}"