diff --git a/.github/actions/install-llama-stack-client/action.yml b/.github/actions/install-llama-stack-client/action.yml
index 553d82f01..3c1c77d9c 100644
--- a/.github/actions/install-llama-stack-client/action.yml
+++ b/.github/actions/install-llama-stack-client/action.yml
@@ -8,9 +8,6 @@ inputs:
     default: ""
 
 outputs:
-  uv-index-url:
-    description: 'UV_INDEX_URL to use (set for release branches)'
-    value: ${{ steps.configure.outputs.uv-index-url }}
   uv-extra-index-url:
     description: 'UV_EXTRA_INDEX_URL to use (set for release branches)'
     value: ${{ steps.configure.outputs.uv-extra-index-url }}
@@ -46,9 +43,8 @@ runs:
             exit 1
           fi
 
-          # Configure to use test.pypi for sync (to resolve RC versions)
-          echo "uv-index-url=https://test.pypi.org/simple/" >> $GITHUB_OUTPUT
-          echo "uv-extra-index-url=https://pypi.org/simple/" >> $GITHUB_OUTPUT
+          # Configure to use test.pypi as extra index (PyPI is primary)
+          echo "uv-extra-index-url=https://test.pypi.org/simple/" >> $GITHUB_OUTPUT
           echo "install-after-sync=true" >> $GITHUB_OUTPUT
           echo "install-source=git+https://github.com/llamastack/llama-stack-client-python.git@$BRANCH" >> $GITHUB_OUTPUT
         elif [ "${{ inputs.client-version }}" = "latest" ]; then
diff --git a/.github/actions/setup-runner/action.yml b/.github/actions/setup-runner/action.yml
index df6706fc3..8e357fb96 100644
--- a/.github/actions/setup-runner/action.yml
+++ b/.github/actions/setup-runner/action.yml
@@ -27,13 +27,11 @@ runs:
     - name: Install dependencies
       shell: bash
       env:
-        UV_INDEX_URL: ${{ steps.client-config.outputs.uv-index-url }}
         UV_EXTRA_INDEX_URL: ${{ steps.client-config.outputs.uv-extra-index-url }}
-        UV_INDEX_STRATEGY: ${{ steps.client-config.outputs.uv-index-url && 'unsafe-best-match' || '' }}
+        UV_INDEX_STRATEGY: ${{ steps.client-config.outputs.uv-extra-index-url && 'unsafe-best-match' || '' }}
       run: |
         # Export UV env vars to GITHUB_ENV so they persist across steps
-        if [ -n "$UV_INDEX_URL" ]; then
-          echo "UV_INDEX_URL=$UV_INDEX_URL" >> $GITHUB_ENV
+        if [ -n "$UV_EXTRA_INDEX_URL" ]; then
           echo "UV_EXTRA_INDEX_URL=$UV_EXTRA_INDEX_URL" >> $GITHUB_ENV
           echo "UV_INDEX_STRATEGY=$UV_INDEX_STRATEGY" >> $GITHUB_ENV
           echo "Exported UV environment variables for subsequent steps"
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 9749cbfb9..9b913ec6a 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -55,11 +55,9 @@ jobs:
 
       - name: Export UV environment variables
         run: |
-          if [ -n "${{ steps.client-config-precommit.outputs.uv-index-url }}" ]; then
-            echo "UV_INDEX_URL=${{ steps.client-config-precommit.outputs.uv-index-url }}" >> $GITHUB_ENV
+          if [ -n "${{ steps.client-config-precommit.outputs.uv-extra-index-url }}" ]; then
             echo "UV_EXTRA_INDEX_URL=${{ steps.client-config-precommit.outputs.uv-extra-index-url }}" >> $GITHUB_ENV
             echo "UV_INDEX_STRATEGY=unsafe-best-match" >> $GITHUB_ENV
-            echo "Setting UV_INDEX_URL to ${{ steps.client-config-precommit.outputs.uv-index-url }}"
             echo "Setting UV_EXTRA_INDEX_URL to ${{ steps.client-config-precommit.outputs.uv-extra-index-url }}"
             echo "Setting UV_INDEX_STRATEGY to unsafe-best-match"
           fi
@@ -139,9 +137,8 @@ jobs:
 
       - name: Sync dev dependencies for mypy
         env:
-          UV_INDEX_URL: ${{ steps.client-config.outputs.uv-index-url }}
           UV_EXTRA_INDEX_URL: ${{ steps.client-config.outputs.uv-extra-index-url }}
-          UV_INDEX_STRATEGY: ${{ steps.client-config.outputs.uv-index-url && 'unsafe-best-match' || '' }}
+          UV_INDEX_STRATEGY: ${{ steps.client-config.outputs.uv-extra-index-url && 'unsafe-best-match' || '' }}
         run: |
           # Check if type_checking group exists, otherwise just use dev
           if grep -q "type.checking" pyproject.toml; then