diff --git a/.github/workflows/deploy-hf-env.yml b/.github/workflows/deploy-hf-env.yml
index 060517586..f74580afa 100644
--- a/.github/workflows/deploy-hf-env.yml
+++ b/.github/workflows/deploy-hf-env.yml
@@ -67,27 +67,33 @@ jobs:
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
           ENVS_CSV_INPUT: ${{ github.event.inputs.envs_csv }}
+          GITHUB_EVENT_INPUTS_HF_NAMESPACE: ${{ github.event.inputs.hf_namespace }}
+          GITHUB_EVENT_INPUTS_OPENENV_VERSION: ${{ github.event.inputs.openenv_version }}
+          GITHUB_EVENT_INPUTS_COLLECTION_NAMESPACE: ${{ github.event.inputs.collection_namespace }}
+          GITHUB_EVENT_INPUTS_PRIVATE: ${{ github.event.inputs.private }}
+          GITHUB_EVENT_INPUTS_SKIP_COLLECTION: ${{ github.event.inputs.skip_collection }}
+          GITHUB_EVENT_INPUTS_DRY_RUN: ${{ github.event.inputs.dry_run }}
         run: |
           set -euo pipefail
           chmod +x scripts/prepare_hf_deployment.sh
 
           cmd=(scripts/prepare_hf_deployment.sh
-            --hf-namespace "${{ github.event.inputs.hf_namespace }}"
-            --openenv-version "${{ github.event.inputs.openenv_version }}"
-            --collection-namespace "${{ github.event.inputs.collection_namespace }}"
+            --hf-namespace "${GITHUB_EVENT_INPUTS_HF_NAMESPACE}"
+            --openenv-version "${GITHUB_EVENT_INPUTS_OPENENV_VERSION}"
+            --collection-namespace "${GITHUB_EVENT_INPUTS_COLLECTION_NAMESPACE}"
           )
 
-          if [ "${{ github.event.inputs.private }}" = "true" ]; then
+          if [ "${GITHUB_EVENT_INPUTS_PRIVATE}" = "true" ]; then
             cmd+=(--private)
           else
             cmd+=(--public)
           fi
 
-          if [ "${{ github.event.inputs.skip_collection }}" = "true" ]; then
+          if [ "${GITHUB_EVENT_INPUTS_SKIP_COLLECTION}" = "true" ]; then
             cmd+=(--skip-collection)
           fi
 
-          if [ "${{ github.event.inputs.dry_run }}" = "true" ]; then
+          if [ "${GITHUB_EVENT_INPUTS_DRY_RUN}" = "true" ]; then
             cmd+=(--dry-run)
           fi
 
diff --git a/.github/workflows/openspiel_base_build.yml b/.github/workflows/openspiel_base_build.yml
index 4eef8f494..f76bb8fa9 100644
--- a/.github/workflows/openspiel_base_build.yml
+++ b/.github/workflows/openspiel_base_build.yml
@@ -104,5 +104,7 @@ jobs:
       - name: Build summary
         run: |
           echo "✅ OpenSpiel base image built and pushed successfully!"
-          echo "📦 Image: ${{ steps.meta-openspiel-base.outputs.tags }}"
+          echo "📦 Image: ${STEPS_META_OPENSPIEL_BASE_OUTPUTS_TAGS}"
           echo "🚀 Next regular build will use this new base image"
+        env:
+          STEPS_META_OPENSPIEL_BASE_OUTPUTS_TAGS: ${{ steps.meta-openspiel-base.outputs.tags }}