diff --git a/.github/workflows/RunTests.yml b/.github/workflows/RunTests.yml
index 0690278891..fe4e36807f 100644
--- a/.github/workflows/RunTests.yml
+++ b/.github/workflows/RunTests.yml
@@ -214,8 +214,9 @@ jobs:
           env:
             GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             GH_REPO: ${{ github.repository }}
+            STEPS_FIND_ISSUE_OUTPUTS_ISSUE_NUMBER: ${{ steps.find_issue.outputs.issue_number }}
           run: |
-            ISSUE_NUMBER=${{ steps.find_issue.outputs.issue_number }}
+            ISSUE_NUMBER=${STEPS_FIND_ISSUE_OUTPUTS_ISSUE_NUMBER}
             LABELS=$(gh issue view $ISSUE_NUMBER --json labels -q '.labels[].name')
 
             if echo "$LABELS" | grep -q "success-run-2"; then
diff --git a/.github/workflows/run_tests_against_package.yml b/.github/workflows/run_tests_against_package.yml
index 6076efd38a..0ec562c56a 100644
--- a/.github/workflows/run_tests_against_package.yml
+++ b/.github/workflows/run_tests_against_package.yml
@@ -95,10 +95,10 @@ jobs:
       - name: Run Tests
         shell: bash
         run: |
-          if [ "${{ inputs.is_scheduled_run }}" == "true" ]; then
-            FINAL_PYTEST_MARKER="${{ inputs.pytest_marker }}"
+          if [ "${INPUTS_IS_SCHEDULED_RUN}" == "true" ]; then
+            FINAL_PYTEST_MARKER="${INPUTS_PYTEST_MARKER}"
           else
-            FINAL_PYTEST_MARKER="${{ inputs.pytest_marker }} and not scheduled_only"
+            FINAL_PYTEST_MARKER="${INPUTS_PYTEST_MARKER} and not scheduled_only"
           fi
           # TODO: Use package data for testing and remove the env vars
           export MAXTEXT_REPO_ROOT=$(pwd)
@@ -106,9 +106,14 @@ jobs:
           export MAXTEXT_TEST_ASSETS_ROOT=$(pwd)/src/MaxText/test_assets
           export MAXTEXT_PKG_DIR=$(pwd)/src/MaxText
           # omit this libtpu init args for gpu tests
-          if [ "${{ inputs.device_type }}" != "cuda12" ]; then
+          if [ "${INPUTS_DEVICE_TYPE}" != "cuda12" ]; then
             export LIBTPU_INIT_ARGS='--xla_tpu_scoped_vmem_limit_kib=65536'
           fi
           # TODO: Fix the skipped tests and remove the deselect flags
           [ "${{ inputs.total_workers }}" -gt 1 ] && .venv/bin/python3 -m pip install --quiet pytest-split && SPLIT_ARGS="--splits ${{ inputs.total_workers }} --group ${{ inputs.worker_group }}" || SPLIT_ARGS=""
-          .venv/bin/python3 -m pytest ${{ inputs.pytest_addopts }} -v -m "${FINAL_PYTEST_MARKER}" --durations=0 --deselect "tests/aot_hlo_identical_test.py::AotHloIdenticalTest::test_default_hlo_match" --deselect "tests/tokenizer_test.py::TokenizerTest::test_detokenize" $SPLIT_ARGS
+          .venv/bin/python3 -m pytest ${INPUTS_PYTEST_ADDOPTS} -v -m "${FINAL_PYTEST_MARKER}" --durations=0 --deselect "tests/aot_hlo_identical_test.py::AotHloIdenticalTest::test_default_hlo_match" --deselect "tests/tokenizer_test.py::TokenizerTest::test_detokenize" $SPLIT_ARGS
+        env:
+          INPUTS_IS_SCHEDULED_RUN: ${{ inputs.is_scheduled_run }}
+          INPUTS_PYTEST_MARKER: ${{ inputs.pytest_marker }}
+          INPUTS_DEVICE_TYPE: ${{ inputs.device_type }}
+          INPUTS_PYTEST_ADDOPTS: ${{ inputs.pytest_addopts }}