diff --git a/.yamato/mobile-build-and-run.yml b/.yamato/mobile-build-and-run.yml
index 22dd5e6b0..b910d62b9 100644
--- a/.yamato/mobile-build-and-run.yml
+++ b/.yamato/mobile-build-and-run.yml
@@ -13,8 +13,8 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
         flavor: b1.large
 
     commands:
-        - choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
-        - unity-downloader-cli -c Editor -c iOS -u {{ editor }} -w --fast
+        - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
+        - unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
         - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
         - chmod +x ./utr
         - ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime
@@ -42,10 +42,10 @@ Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}:
 
     commands:
         # Download unity-downloader-cli
-        - choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
+        - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
         - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools/utr-standalone/utr.bat --output utr.bat
         - python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform Android
-        - unity-downloader-cli -c Editor -c Android -u {{ editor }} -w --fast
+        - unity-downloader-cli -c Editor -c Android -u {{ editor }} --fast --wait
         # Build player(s)
         - set UTR_VERSION=0.12.0
         - ./utr.bat --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=mono --build-only --testfilter=Unity.BossRoom.Tests.Runtime
diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
index ff030277f..7fc50c638 100644
--- a/.yamato/project-standards.yml
+++ b/.yamato/project-standards.yml
@@ -9,7 +9,7 @@ standards_{{ projects.first.name }}:
   commands:
     - dotnet --version
     - dotnet format --version
-    - choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
-    - unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor -w --fast
+    - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
     - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
     - dotnet run --project dotnet-tools/netcode.standards -- --project={{ projects.first.path }} --check
diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml
index 609237adc..c20d3a979 100644
--- a/.yamato/project-tests.yml
+++ b/.yamato/project-tests.yml
@@ -15,7 +15,7 @@ test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
     flavor: {{ platform.flavor}}
   commands:
     - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - choco upgrade unity-downloader-cli -y -s https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/unity-choco-local
+    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
     - unity-downloader-cli -u {{ editor }} -c editor -w --fast
     - upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg=--testfilter=Unity.BossRoom.Tests.Runtime
   artifacts: