diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml
index 80fb56ca9b..df5472d812 100644
--- a/.yamato/wrench/api-validation-jobs.yml
+++ b/.yamato/wrench/api-validation-jobs.yml
@@ -20,7 +20,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/PackageJsonCondersor.py
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
index 209bcb9709..7f7d3ee606 100644
--- a/.yamato/wrench/package-pack-jobs.yml
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml
index ff3f83894f..232f1f4913 100644
--- a/.yamato/wrench/preview-a-p-v.yml
+++ b/.yamato/wrench/preview-a-p-v.yml
@@ -25,7 +25,7 @@ all_preview_apv_jobs:
   - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 2021.3 manifest (MacOS).
 preview_apv_-_2021_3_-_macos:
@@ -42,7 +42,7 @@ preview_apv_-_2021_3_-_macos:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2021.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -76,10 +76,10 @@ preview_apv_-_2021_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 2021.3 manifest (Ubuntu).
 preview_apv_-_2021_3_-_ubuntu:
@@ -96,7 +96,7 @@ preview_apv_-_2021_3_-_ubuntu:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2021.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -130,10 +130,10 @@ preview_apv_-_2021_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 2021.3 manifest (Windows).
 preview_apv_-_2021_3_-_windows:
@@ -151,7 +151,7 @@ preview_apv_-_2021_3_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2021.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -185,10 +185,10 @@ preview_apv_-_2021_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS).
 preview_apv_-_2022_3_-_macos:
@@ -205,7 +205,7 @@ preview_apv_-_2022_3_-_macos:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -239,10 +239,10 @@ preview_apv_-_2022_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu).
 preview_apv_-_2022_3_-_ubuntu:
@@ -259,7 +259,7 @@ preview_apv_-_2022_3_-_ubuntu:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -293,10 +293,10 @@ preview_apv_-_2022_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (Windows).
 preview_apv_-_2022_3_-_windows:
@@ -314,7 +314,7 @@ preview_apv_-_2022_3_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -348,10 +348,10 @@ preview_apv_-_2022_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
 preview_apv_-_6000_0_-_macos:
@@ -368,7 +368,7 @@ preview_apv_-_6000_0_-_macos:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -402,10 +402,10 @@ preview_apv_-_6000_0_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
 preview_apv_-_6000_0_-_ubuntu:
@@ -422,7 +422,7 @@ preview_apv_-_6000_0_-_ubuntu:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -456,10 +456,10 @@ preview_apv_-_6000_0_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Windows).
 preview_apv_-_6000_0_-_windows:
@@ -477,7 +477,7 @@ preview_apv_-_6000_0_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -511,10 +511,10 @@ preview_apv_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
 preview_apv_-_6000_1_-_macos:
@@ -531,7 +531,7 @@ preview_apv_-_6000_1_-_macos:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -565,10 +565,10 @@ preview_apv_-_6000_1_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
 preview_apv_-_6000_1_-_ubuntu:
@@ -585,7 +585,7 @@ preview_apv_-_6000_1_-_ubuntu:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -619,10 +619,10 @@ preview_apv_-_6000_1_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (Windows).
 preview_apv_-_6000_1_-_windows:
@@ -640,7 +640,7 @@ preview_apv_-_6000_1_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -674,10 +674,10 @@ preview_apv_-_6000_1_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
 preview_apv_-_6000_2_-_macos:
@@ -694,7 +694,7 @@ preview_apv_-_6000_2_-_macos:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -728,10 +728,10 @@ preview_apv_-_6000_2_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
 preview_apv_-_6000_2_-_ubuntu:
@@ -748,7 +748,7 @@ preview_apv_-_6000_2_-_ubuntu:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -782,10 +782,10 @@ preview_apv_-_6000_2_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (Windows).
 preview_apv_-_6000_2_-_windows:
@@ -803,7 +803,7 @@ preview_apv_-_6000_2_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -837,10 +837,10 @@ preview_apv_-_6000_2_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
 preview_apv_-_6000_3_-_macos:
@@ -857,7 +857,7 @@ preview_apv_-_6000_3_-_macos:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u trunk -c Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -891,10 +891,10 @@ preview_apv_-_6000_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
 preview_apv_-_6000_3_-_ubuntu:
@@ -911,7 +911,7 @@ preview_apv_-_6000_3_-_ubuntu:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u trunk -c Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -945,10 +945,10 @@ preview_apv_-_6000_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (Windows).
 preview_apv_-_6000_3_-_windows:
@@ -966,7 +966,7 @@ preview_apv_-_6000_3_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u trunk -c Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -1000,8 +1000,8 @@ preview_apv_-_6000_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index 6c924520f2..e512533c9e 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -208,10 +208,10 @@ publish_dry_run_netcode_gameobjects:
         ignore_artifact: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Publish  for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_netcode_gameobjects:
@@ -420,8 +420,8 @@ publish_netcode_gameobjects:
         ignore_artifact: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml
index 9b49ae4900..19652dc898 100644
--- a/.yamato/wrench/recipe-regeneration.yml
+++ b/.yamato/wrench/recipe-regeneration.yml
@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
+  - command: dotnet run --project Tools/CI/NGO.Cookbook.csproj
   - command: |-
       if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
         git status
         echo "Your repo is not clean - diff output:"
         git diff
         echo "You must run recipe generation after updating recipes to update the generated YAML!"
-        echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
+        echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
         exit 1
       fi
   variables:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index 71893f5c05..0bb21ff8ef 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -13,10 +13,10 @@ validate_-_netcode_gameobjects_-_2021_3_-_macos:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -29,7 +29,7 @@ validate_-_netcode_gameobjects_-_2021_3_-_macos:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -50,20 +50,20 @@ validate_-_netcode_gameobjects_-_2021_3_-_macos:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -79,10 +79,10 @@ validate_-_netcode_gameobjects_-_2021_3_-_ubuntu:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -95,7 +95,7 @@ validate_-_netcode_gameobjects_-_2021_3_-_ubuntu:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -116,20 +116,20 @@ validate_-_netcode_gameobjects_-_2021_3_-_ubuntu:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -145,10 +145,10 @@ validate_-_netcode_gameobjects_-_2021_3_-_windows:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -161,7 +161,7 @@ validate_-_netcode_gameobjects_-_2021_3_-_windows:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -182,20 +182,20 @@ validate_-_netcode_gameobjects_-_2021_3_-_windows:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -211,10 +211,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -227,7 +227,7 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -248,20 +248,20 @@ validate_-_netcode_gameobjects_-_2022_3_-_macos:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -277,10 +277,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -293,7 +293,7 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -314,20 +314,20 @@ validate_-_netcode_gameobjects_-_2022_3_-_ubuntu:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -343,10 +343,10 @@ validate_-_netcode_gameobjects_-_2022_3_-_windows:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -359,7 +359,7 @@ validate_-_netcode_gameobjects_-_2022_3_-_windows:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -380,20 +380,20 @@ validate_-_netcode_gameobjects_-_2022_3_-_windows:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -409,10 +409,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -425,7 +425,7 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -446,20 +446,20 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -475,10 +475,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -491,7 +491,7 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -512,20 +512,20 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -541,10 +541,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -557,7 +557,7 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -578,20 +578,20 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -607,10 +607,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_macos:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -623,7 +623,7 @@ validate_-_netcode_gameobjects_-_6000_1_-_macos:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -644,20 +644,20 @@ validate_-_netcode_gameobjects_-_6000_1_-_macos:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -673,10 +673,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_ubuntu:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -689,7 +689,7 @@ validate_-_netcode_gameobjects_-_6000_1_-_ubuntu:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -710,20 +710,20 @@ validate_-_netcode_gameobjects_-_6000_1_-_ubuntu:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -739,10 +739,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_windows:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -755,7 +755,7 @@ validate_-_netcode_gameobjects_-_6000_1_-_windows:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -776,20 +776,20 @@ validate_-_netcode_gameobjects_-_6000_1_-_windows:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -805,10 +805,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -821,7 +821,7 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -842,20 +842,20 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -871,10 +871,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -887,7 +887,7 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -908,20 +908,20 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -937,10 +937,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
+  - command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -953,7 +953,7 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -974,20 +974,20 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -1003,10 +1003,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_macos:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u trunk -c Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -1019,7 +1019,7 @@ validate_-_netcode_gameobjects_-_6000_3_-_macos:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -1040,20 +1040,20 @@ validate_-_netcode_gameobjects_-_6000_3_-_macos:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -1069,10 +1069,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_ubuntu:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u trunk -c Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -1085,7 +1085,7 @@ validate_-_netcode_gameobjects_-_6000_3_-_ubuntu:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -1106,20 +1106,20 @@ validate_-_netcode_gameobjects_-_6000_3_-_ubuntu:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
@@ -1135,10 +1135,10 @@ validate_-_netcode_gameobjects_-_6000_3_-_windows:
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u trunk -c Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -1151,7 +1151,7 @@ validate_-_netcode_gameobjects_-_6000_3_-_windows:
   - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+  - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
     timeout: 40
     retries: 1
   after:
@@ -1172,20 +1172,20 @@ validate_-_netcode_gameobjects_-_6000_3_-_windows:
       - '*.log'
       - '*.xml'
       - artifacts/**/*
-      - test-netcode.gameobjects/Logs/**
-      - test-netcode.gameobjects/Library/*.log
-      - test-netcode.gameobjects/*.log
-      - test-netcode.gameobjects/Builds/*.log
+      - testproject/Logs/**
+      - testproject/Library/*.log
+      - testproject/*.log
+      - testproject/Builds/*.log
       - build/test-results/**
       browsable: onDemand
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
   labels:
   - Packages:netcode.gameobjects
 
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
index 9a3115c5cc..017e6e5690 100644
--- a/.yamato/wrench/wrench_config.json
+++ b/.yamato/wrench/wrench_config.json
@@ -31,7 +31,7 @@
   },
   "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
   "branch_pattern": "ReleaseSlash",
-  "wrench_version": "0.11.3.0",
+  "wrench_version": "0.12.1.0",
   "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
-  "cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
+  "cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
 }
\ No newline at end of file
diff --git a/Tools/CI/NGO.Cookbook.csproj b/Tools/CI/NGO.Cookbook.csproj
index 485e4a03cf..bfc7c09185 100644
--- a/Tools/CI/NGO.Cookbook.csproj
+++ b/Tools/CI/NGO.Cookbook.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.11.3" />
+      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.12.1" />
     </ItemGroup>
 
 </Project>
diff --git a/Tools/CI/Settings/NGOSettings.cs b/Tools/CI/Settings/NGOSettings.cs
index ebd24769c0..a174da52e2 100644
--- a/Tools/CI/Settings/NGOSettings.cs
+++ b/Tools/CI/Settings/NGOSettings.cs
@@ -9,12 +9,22 @@ public class NGOSettings : AnnotatedSettingsBase
     // Path from the root of the repository where packages are located.
     readonly string[] packagesRootPaths = {"."};
 
+    static ValidationOptions validationOptions = new ValidationOptions()
+    {
+        ProjectPath = "testproject",
+        UtrTestingYamatoTimeout = 40
+    };
+
     // update this to list all packages in this repo that you want to release.
     Dictionary<string, PackageOptions> PackageOptions = new()
     {
         {
             "com.unity.netcode.gameobjects",
-            new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
+            new PackageOptions()
+            {
+                ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
+                ValidationOptions = validationOptions
+            }
         }
     };