diff --git a/.github/workflows/java-pr.yml b/.github/workflows/java-pr.yml
index a3f405169e..1fffcd516d 100644
--- a/.github/workflows/java-pr.yml
+++ b/.github/workflows/java-pr.yml
@@ -47,7 +47,9 @@ jobs:
         id: setup-env
         uses: ./.github/actions/setup-env
       - name: Run Spotless
-        run: ./cicd/run-spotless --changed-files="${{ steps.setup-env.outputs.changed-files }}"
+        run: ./cicd/run-spotless --changed-files="${STEPS_SETUP_ENV_OUTPUTS_CHANGED_FILES}"
+        env:
+          STEPS_SETUP_ENV_OUTPUTS_CHANGED_FILES: ${{ steps.setup-env.outputs.changed-files }}
   java_build:
     name: Build
     timeout-minutes: 60
@@ -59,7 +61,9 @@ jobs:
         id: setup-env
         uses: ./.github/actions/setup-env
       - name: Run Build
-        run: ./cicd/run-build --changed-files="${{ steps.setup-env.outputs.changed-files }}"
+        run: ./cicd/run-build --changed-files="${STEPS_SETUP_ENV_OUTPUTS_CHANGED_FILES}"
+        env:
+          STEPS_SETUP_ENV_OUTPUTS_CHANGED_FILES: ${{ steps.setup-env.outputs.changed-files }}
       - name: Cleanup Java Environment
         uses: ./.github/actions/cleanup-java-env
   java_unit_tests:
@@ -73,7 +77,9 @@ jobs:
         id: setup-env
         uses: ./.github/actions/setup-env
       - name: Run Unit Tests
-        run: ./cicd/run-unit-tests --changed-files="${{ steps.setup-env.outputs.changed-files }}"
+        run: ./cicd/run-unit-tests --changed-files="${STEPS_SETUP_ENV_OUTPUTS_CHANGED_FILES}"
+        env:
+          STEPS_SETUP_ENV_OUTPUTS_CHANGED_FILES: ${{ steps.setup-env.outputs.changed-files }}
       - name: Cleanup Java Environment
         uses: ./.github/actions/cleanup-java-env
   java_integration_tests_templates:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 488716fe8c..c80182b243 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,8 +27,8 @@ jobs:
     steps:
     - name: Get releaser identity
       run: |
-        git config --global user.name '${{github.actor}}'
-        git config --global user.email '${{github.actor}}@users.noreply.github.com'
+        git config --global user.name '${GITHUB_ACTOR}'
+        git config --global user.email '${GITHUB_ACTOR}@users.noreply.github.com'
     - name: Declare release branch name and tag name
       id: variables
       run: |