diff --git a/.github/workflows/test-export-matrix-variables.yml b/.github/workflows/test-export-matrix-variables.yml
index 9d466c95f3..76cbe6b85c 100644
--- a/.github/workflows/test-export-matrix-variables.yml
+++ b/.github/workflows/test-export-matrix-variables.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         installation:
-          - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
+          - pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
     with:
       binary-matrix: ${{ toJSON(matrix) }}
       script: |
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         installation:
-          - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
+          - pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
     with:
       binary-matrix: ${{ toJSON(matrix) }}
       script: |
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         installation:
-          - pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
+          - pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
     with:
       binary-matrix: ${{ toJSON(matrix) }}
       script: |
diff --git a/.github/workflows/test_build_wheels_linux_with_cuda.yml b/.github/workflows/test_build_wheels_linux_with_cuda.yml
index a054122f26..475ea62d73 100644
--- a/.github/workflows/test_build_wheels_linux_with_cuda.yml
+++ b/.github/workflows/test_build_wheels_linux_with_cuda.yml
@@ -11,7 +11,6 @@ on:
       - tools/scripts/generate_binary_build_matrix.py
   workflow_dispatch:
 
-# test
 permissions:
   id-token: write
   contents: read
diff --git a/.github/workflows/test_build_wheels_windows_with_cuda.yml b/.github/workflows/test_build_wheels_windows_with_cuda.yml
index dea152f8e9..9520c45cc6 100644
--- a/.github/workflows/test_build_wheels_windows_with_cuda.yml
+++ b/.github/workflows/test_build_wheels_windows_with_cuda.yml
@@ -14,7 +14,6 @@ permissions:
   id-token: write
   contents: read
 
-# test/test
 jobs:
   generate-matrix:
     uses: ./.github/workflows/generate_binary_build_matrix.yml
diff --git a/.github/workflows/test_macos_job.yml b/.github/workflows/test_macos_job.yml
index ae70e6a699..1378135acf 100644
--- a/.github/workflows/test_macos_job.yml
+++ b/.github/workflows/test_macos_job.yml
@@ -19,7 +19,7 @@ jobs:
       script: |
         conda create --yes --quiet -n test python=3.8
         conda activate test
-        python3 -m pip install --extra-index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
+        python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
         # Can import pytorch
         python3 -c 'import torch'
   test-m1:
@@ -34,7 +34,7 @@ jobs:
       script: |
         conda create --yes --quiet -n test python=3.8
         conda activate test
-        python3 -m pip install --extra-index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
+        python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
         # Can import pytorch, cuda is available
         python3 -c 'import torch'
   test-x86-with-repo:
@@ -49,7 +49,7 @@ jobs:
       script: |
         conda create --yes --quiet -n test python=3.8
         conda activate test
-        python3 -m pip install --extra-index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
+        python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
         # Can import pytorch
         python3 -c 'import torch'
   test-m1-with-repo:
@@ -66,7 +66,7 @@ jobs:
       script: |
         conda create --yes --quiet -n test python=3.8
         conda activate test
-        python3 -m pip install --extra-index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
+        python3 -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
         # Can import pytorch, cuda is available
         python3 -c 'import torch'
   test-upload-artifact:
diff --git a/.github/workflows/test_windows_job.yml b/.github/workflows/test_windows_job.yml
index f6617d8dd3..df9f8f0edb 100644
--- a/.github/workflows/test_windows_job.yml
+++ b/.github/workflows/test_windows_job.yml
@@ -19,7 +19,7 @@ jobs:
       script: |
         conda create --yes --quiet -n test python=3.8
         conda activate test
-        python -m pip install --extra-index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
+        python -m pip install --index-url https://download.pytorch.org/whl/nightly/cpu --pre torch
         # Can import pytorch
         python -c 'import torch'
   test-gpu:
diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py
index 74e36405cb..ca8757b019 100644
--- a/tools/scripts/generate_binary_build_matrix.py
+++ b/tools/scripts/generate_binary_build_matrix.py
@@ -273,7 +273,6 @@ def get_wheel_install_command(
     use_only_dl_pytorch_org: bool,
 ) -> str:
 
-    index_url_option = "--index-url" if os != LINUX_AARCH64 else "--extra-index-url"
     if  channel == RELEASE and (not use_only_dl_pytorch_org) and (
         (gpu_arch_version == "12.1" and os == LINUX)
         or (
@@ -289,7 +288,7 @@ def get_wheel_install_command(
             if channel == "nightly"
             else f"{WHL_INSTALL_BASE} {PACKAGES_TO_INSTALL_WHL}"
         )
-        return f"{whl_install_command} {index_url_option} {get_base_download_url_for_repo('whl', channel, gpu_arch_type, desired_cuda)}"
+        return f"{whl_install_command} --index-url {get_base_download_url_for_repo('whl', channel, gpu_arch_type, desired_cuda)}"
 
 
 def generate_conda_matrix(