diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh b/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh
new file mode 100644
index 0000000000..2380121236
--- /dev/null
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# This is an auto-generated script. Do not edit manually!
+set -x
+
+set -e
+if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
+  echo "removed existing archive infrastructure_instability_detection_standalone.zip"
+  rm "infrastructure_instability_detection_standalone.zip" || true
+fi
+
+if [ -d "infrastructure_instability_detection_standalone" ]; then
+  echo "removed existing directory infrastructure_instability_detection_standalone/"
+  rm -rf "infrastructure_instability_detection_standalone" || true
+fi
+
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
+
+if [ -d "infrastructure_instability_detection" ]; then
+  echo "removing infrastructure_instability_detection folder to avoid name clash"
+  rm -rf infrastructure_instability_detection/ || true
+fi
+
+unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
+
+echo "downloading and extracting patterns"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
+
+if [ -d "patterns" ]; then
+  echo "removing patterns folder to avoid name clash"
+  rm -rf patterns/ || true
+fi
+
+unzip -q patterns.zip && rm patterns.zip || true
+
+echo "running '$(pwd)/infrastructure_instability_detection'"
+./infrastructure_instability_detection || true
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
new file mode 100644
index 0000000000..e37062e974
--- /dev/null
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# This is an auto-generated script. Do not edit manually!
+set -x
+
+set -e
+if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
+  echo "removed existing archive infrastructure_instability_detection_standalone.zip"
+  rm "infrastructure_instability_detection_standalone.zip" || true
+fi
+
+if [ -d "infrastructure_instability_detection_standalone" ]; then
+  echo "removed existing directory infrastructure_instability_detection_standalone/"
+  rm -rf "infrastructure_instability_detection_standalone" || true
+fi
+
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
+
+if [ -d "infrastructure_instability_detection" ]; then
+  echo "removing infrastructure_instability_detection folder to avoid name clash"
+  rm -rf infrastructure_instability_detection/ || true
+fi
+
+unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
+
+echo "downloading and extracting patterns"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
+
+if [ -d "patterns" ]; then
+  echo "removing patterns folder to avoid name clash"
+  rm -rf patterns/ || true
+fi
+
+unzip -q patterns.zip && rm patterns.zip || true
+
+echo "running '$(pwd)/infrastructure_instability_detection'"
+./infrastructure_instability_detection || true
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
new file mode 100644
index 0000000000..64513447d2
--- /dev/null
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
@@ -0,0 +1,11 @@
+@echo on
+rem This is an auto-generated script. Do not edit manually!
+
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
+IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
+powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5
+IF EXIST "patterns" rmdir /s /q patterns
+powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('patterns.zip', '.'); }" && DEL "patterns.zip"
+infrastructure_instability_detection
+exit /b 0
diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml
index 430e392199..c5c9d6c3fe 100644
--- a/.yamato/wrench/api-validation-jobs.yml
+++ b/.yamato/wrench/api-validation-jobs.yml
@@ -9,7 +9,7 @@ api_validation_-_inputsystem_-_2021_3_-_windows:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -29,10 +29,7 @@ api_validation_-_inputsystem_-_2021_3_-_windows:
     timeout: 2
     retries: 0
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -50,11 +47,11 @@ api_validation_-_inputsystem_-_2021_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   triggers:
     expression: push.branch match "^release/.*"
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
index c33da74422..19c073e30f 100644
--- a/.yamato/wrench/package-pack-jobs.yml
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -12,27 +12,19 @@ package_pack_-_inputsystem:
   - 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: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
-  - 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: mv ./Assets/Samples ./Packages/com.unity.inputsystem
   - command: mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
   - command: upm-ci package pack --package-path Packages/com.unity.inputsystem
   - command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.inputsystem_packages.json
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     packages:
       paths:
       - upm-ci~/packages/**/*
   variables:
     UPMCI_ACK_LARGE_PACKAGE: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml
index 9ee5fc5615..701b3fe6d6 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:
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 2021.3 manifest (MacOS).
 preview_apv_-_2021_3_-_macos:
@@ -35,7 +35,7 @@ preview_apv_-_2021_3_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -48,10 +48,7 @@ preview_apv_-_2021_3_-_macos:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2021.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -79,10 +76,10 @@ preview_apv_-_2021_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 2021.3 manifest (Ubuntu).
 preview_apv_-_2021_3_-_ubuntu:
@@ -92,7 +89,7 @@ preview_apv_-_2021_3_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -105,10 +102,7 @@ preview_apv_-_2021_3_-_ubuntu:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2021.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -136,10 +130,10 @@ preview_apv_-_2021_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 2021.3 manifest (Windows).
 preview_apv_-_2021_3_-_windows:
@@ -150,7 +144,7 @@ preview_apv_-_2021_3_-_windows:
     flavor: b1.large
   commands:
   - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -163,10 +157,7 @@ preview_apv_-_2021_3_-_windows:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2021.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: python PythonScripts/editor_manifest_validator.py --version=2021.3 --wrench-config=.yamato/wrench/wrench_config.json
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -194,10 +185,10 @@ preview_apv_-_2021_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS).
 preview_apv_-_2022_3_-_macos:
@@ -207,7 +198,7 @@ preview_apv_-_2022_3_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -220,10 +211,7 @@ preview_apv_-_2022_3_-_macos:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -251,10 +239,10 @@ preview_apv_-_2022_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu).
 preview_apv_-_2022_3_-_ubuntu:
@@ -264,7 +252,7 @@ preview_apv_-_2022_3_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -277,10 +265,7 @@ preview_apv_-_2022_3_-_ubuntu:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -308,10 +293,10 @@ preview_apv_-_2022_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (Windows).
 preview_apv_-_2022_3_-_windows:
@@ -322,7 +307,7 @@ preview_apv_-_2022_3_-_windows:
     flavor: b1.large
   commands:
   - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -335,10 +320,7 @@ preview_apv_-_2022_3_-_windows:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=2022.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: python PythonScripts/editor_manifest_validator.py --version=2022.3 --wrench-config=.yamato/wrench/wrench_config.json
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -366,10 +348,10 @@ preview_apv_-_2022_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
 preview_apv_-_6000_0_-_macos:
@@ -379,7 +361,7 @@ preview_apv_-_6000_0_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -392,10 +374,7 @@ preview_apv_-_6000_0_-_macos:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -423,10 +402,10 @@ preview_apv_-_6000_0_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
 preview_apv_-_6000_0_-_ubuntu:
@@ -436,7 +415,7 @@ preview_apv_-_6000_0_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -449,10 +428,7 @@ preview_apv_-_6000_0_-_ubuntu:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -480,10 +456,10 @@ preview_apv_-_6000_0_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Windows).
 preview_apv_-_6000_0_-_windows:
@@ -494,7 +470,7 @@ preview_apv_-_6000_0_-_windows:
     flavor: b1.large
   commands:
   - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -507,10 +483,7 @@ preview_apv_-_6000_0_-_windows:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: python PythonScripts/editor_manifest_validator.py --version=6000.0 --wrench-config=.yamato/wrench/wrench_config.json
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -538,10 +511,10 @@ preview_apv_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
 preview_apv_-_6000_1_-_macos:
@@ -551,7 +524,7 @@ preview_apv_-_6000_1_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -564,10 +537,7 @@ preview_apv_-_6000_1_-_macos:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -595,10 +565,10 @@ preview_apv_-_6000_1_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
 preview_apv_-_6000_1_-_ubuntu:
@@ -608,7 +578,7 @@ preview_apv_-_6000_1_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -621,10 +591,7 @@ preview_apv_-_6000_1_-_ubuntu:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -652,10 +619,10 @@ preview_apv_-_6000_1_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.1 manifest (Windows).
 preview_apv_-_6000_1_-_windows:
@@ -666,7 +633,7 @@ preview_apv_-_6000_1_-_windows:
     flavor: b1.large
   commands:
   - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -679,10 +646,7 @@ preview_apv_-_6000_1_-_windows:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: python PythonScripts/editor_manifest_validator.py --version=6000.1 --wrench-config=.yamato/wrench/wrench_config.json
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -710,10 +674,10 @@ preview_apv_-_6000_1_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
 preview_apv_-_6000_2_-_macos:
@@ -723,7 +687,7 @@ preview_apv_-_6000_2_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -736,10 +700,7 @@ preview_apv_-_6000_2_-_macos:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -767,10 +728,10 @@ preview_apv_-_6000_2_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
 preview_apv_-_6000_2_-_ubuntu:
@@ -780,7 +741,7 @@ preview_apv_-_6000_2_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -793,10 +754,7 @@ preview_apv_-_6000_2_-_ubuntu:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -824,10 +782,10 @@ preview_apv_-_6000_2_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Functional tests for dependents found in the latest 6000.2 manifest (Windows).
 preview_apv_-_6000_2_-_windows:
@@ -838,7 +796,7 @@ preview_apv_-_6000_2_-_windows:
     flavor: b1.large
   commands:
   - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -851,10 +809,7 @@ preview_apv_-_6000_2_-_windows:
   - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
   - command: python PythonScripts/editor_manifest_validator.py --version=6000.2 --wrench-config=.yamato/wrench/wrench_config.json
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -882,8 +837,8 @@ preview_apv_-_6000_2_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index 3f919e9d71..717c3337ae 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -9,7 +9,7 @@ publish_dry_run_inputsystem:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -18,10 +18,7 @@ publish_dry_run_inputsystem:
   - command: python PythonScripts/ignore_existing_package_failure.py
   - command: python PythonScripts/run_publish_if_any_package_left.py --dry-run
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     logs:
       paths:
@@ -151,13 +148,13 @@ publish_dry_run_inputsystem:
         unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   triggers:
     expression: push.branch match "^release/.*"
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
 # Publish  for inputsystem to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_inputsystem:
@@ -167,7 +164,7 @@ publish_inputsystem:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -176,10 +173,7 @@ publish_inputsystem:
   - command: python PythonScripts/ignore_existing_package_failure.py
   - command: python PythonScripts/run_publish_if_any_package_left.py
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     logs:
       paths:
@@ -309,8 +303,8 @@ publish_inputsystem:
         unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml
index e4c708dd96..85c211e549 100644
--- a/.yamato/wrench/recipe-regeneration.yml
+++ b/.yamato/wrench/recipe-regeneration.yml
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
 
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index 8963a3e155..46ee5d777b 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -9,7 +9,7 @@ validate_-_inputsystem_-_2021_3_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -21,7 +21,7 @@ validate_-_inputsystem_-_2021_3_-_macos:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -30,13 +30,10 @@ validate_-_inputsystem_-_2021_3_-_macos:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -63,10 +60,10 @@ validate_-_inputsystem_-_2021_3_-_macos:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -78,7 +75,7 @@ validate_-_inputsystem_-_2021_3_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -90,7 +87,7 @@ validate_-_inputsystem_-_2021_3_-_ubuntu:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -99,13 +96,10 @@ validate_-_inputsystem_-_2021_3_-_ubuntu:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -132,10 +126,10 @@ validate_-_inputsystem_-_2021_3_-_ubuntu:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -147,7 +141,7 @@ validate_-_inputsystem_-_2021_3_-_windows:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -159,7 +153,7 @@ validate_-_inputsystem_-_2021_3_-_windows:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -168,13 +162,10 @@ validate_-_inputsystem_-_2021_3_-_windows:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -201,10 +192,10 @@ validate_-_inputsystem_-_2021_3_-_windows:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -216,7 +207,7 @@ validate_-_inputsystem_-_2022_3_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -228,7 +219,7 @@ validate_-_inputsystem_-_2022_3_-_macos:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -237,13 +228,10 @@ validate_-_inputsystem_-_2022_3_-_macos:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -270,10 +258,10 @@ validate_-_inputsystem_-_2022_3_-_macos:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -285,7 +273,7 @@ validate_-_inputsystem_-_2022_3_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -297,7 +285,7 @@ validate_-_inputsystem_-_2022_3_-_ubuntu:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -306,13 +294,10 @@ validate_-_inputsystem_-_2022_3_-_ubuntu:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -339,10 +324,10 @@ validate_-_inputsystem_-_2022_3_-_ubuntu:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -354,7 +339,7 @@ validate_-_inputsystem_-_2022_3_-_windows:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -366,7 +351,7 @@ validate_-_inputsystem_-_2022_3_-_windows:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -375,13 +360,10 @@ validate_-_inputsystem_-_2022_3_-_windows:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -408,10 +390,10 @@ validate_-_inputsystem_-_2022_3_-_windows:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -423,7 +405,7 @@ validate_-_inputsystem_-_6000_0_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -435,7 +417,7 @@ validate_-_inputsystem_-_6000_0_-_macos:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -444,13 +426,10 @@ validate_-_inputsystem_-_6000_0_-_macos:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -477,10 +456,10 @@ validate_-_inputsystem_-_6000_0_-_macos:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -492,7 +471,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -504,7 +483,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -513,13 +492,10 @@ validate_-_inputsystem_-_6000_0_-_ubuntu:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -546,10 +522,10 @@ validate_-_inputsystem_-_6000_0_-_ubuntu:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -561,7 +537,7 @@ validate_-_inputsystem_-_6000_0_-_windows:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -573,7 +549,7 @@ validate_-_inputsystem_-_6000_0_-_windows:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -582,13 +558,10 @@ validate_-_inputsystem_-_6000_0_-_windows:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -615,10 +588,10 @@ validate_-_inputsystem_-_6000_0_-_windows:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -630,7 +603,7 @@ validate_-_inputsystem_-_6000_1_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -642,7 +615,7 @@ validate_-_inputsystem_-_6000_1_-_macos:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -651,13 +624,10 @@ validate_-_inputsystem_-_6000_1_-_macos:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -684,10 +654,10 @@ validate_-_inputsystem_-_6000_1_-_macos:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -699,7 +669,7 @@ validate_-_inputsystem_-_6000_1_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -711,7 +681,7 @@ validate_-_inputsystem_-_6000_1_-_ubuntu:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -720,13 +690,10 @@ validate_-_inputsystem_-_6000_1_-_ubuntu:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -753,10 +720,10 @@ validate_-_inputsystem_-_6000_1_-_ubuntu:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -768,7 +735,7 @@ validate_-_inputsystem_-_6000_1_-_windows:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -780,7 +747,7 @@ validate_-_inputsystem_-_6000_1_-_windows:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -789,13 +756,10 @@ validate_-_inputsystem_-_6000_1_-_windows:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -822,10 +786,10 @@ validate_-_inputsystem_-_6000_1_-_windows:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -837,7 +801,7 @@ validate_-_inputsystem_-_6000_2_-_macos:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -849,7 +813,7 @@ validate_-_inputsystem_-_6000_2_-_macos:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -858,13 +822,10 @@ validate_-_inputsystem_-_6000_2_-_macos:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -891,10 +852,10 @@ validate_-_inputsystem_-_6000_2_-_macos:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -906,7 +867,7 @@ validate_-_inputsystem_-_6000_2_-_ubuntu:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -918,7 +879,7 @@ validate_-_inputsystem_-_6000_2_-_ubuntu:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -927,13 +888,10 @@ validate_-_inputsystem_-_6000_2_-_ubuntu:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
-  - command: bash ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
-    timeout: 10
-    retries: 1
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
     Crash Dumps:
       paths:
@@ -960,10 +918,10 @@ validate_-_inputsystem_-_6000_2_-_ubuntu:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
@@ -975,7 +933,7 @@ validate_-_inputsystem_-_6000_2_-_windows:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_236616cc910608f3016a29947795c2e53f0c0dbfa45128d551397825ed65689e.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-56_6391218b3c9a0a6d36cd0b122ff5dd48d68381a518cd09da6f7279c68a7c7962.zip -o wrench-localapv.zip
   - 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
@@ -987,7 +945,7 @@ validate_-_inputsystem_-_6000_2_-_windows:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 20
+    timeout: 40
     retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
@@ -996,13 +954,10 @@ validate_-_inputsystem_-_6000_2_-_windows:
     timeout: 10
     retries: 0
   - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
-    timeout: 30
+    timeout: 40
     retries: 1
   after:
-  - command: cmd.exe /c "curl -s https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0"
-  - command: cmd.exe /c "run_standalone_instability_detection-latest.bat 0.5.1 || exit 0"
-    timeout: 10
-    retries: 1
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     Crash Dumps:
       paths:
@@ -1029,10 +984,10 @@ validate_-_inputsystem_-_6000_2_-_windows:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.10.36.0
+    UPMPVP_CONTEXT_WRENCH: 0.10.37.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.10.36.0
+    Wrench: 0.10.37.0
   labels:
   - Packages:inputsystem
 
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
index 08417e2e9c..ab50aa418b 100644
--- a/.yamato/wrench/wrench_config.json
+++ b/.yamato/wrench/wrench_config.json
@@ -34,7 +34,7 @@
   },
   "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_inputsystem",
   "branch_pattern": "ReleaseSlash",
-  "wrench_version": "0.10.36.0",
+  "wrench_version": "0.10.37.0",
   "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
   "cs_project_path": "Tools/CI/InputSystem.Cookbook.csproj"
 }
\ No newline at end of file
diff --git a/Tools/CI/InputSystem.Cookbook.csproj b/Tools/CI/InputSystem.Cookbook.csproj
index a60fa2f818..47b1bfe16b 100644
--- a/Tools/CI/InputSystem.Cookbook.csproj
+++ b/Tools/CI/InputSystem.Cookbook.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.36" />
+      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.37" />
     </ItemGroup>
 
 </Project>