diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml
index 900e6c7377..061e83bdb6 100644
--- a/.yamato/input-system-editor-functional-tests.yml
+++ b/.yamato/input-system-editor-functional-tests.yml
@@ -226,24 +226,6 @@ inputsystem-editorfunctionaltests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-EditorFunctionalTests - 6000.7 - MacOs13
-inputsystem-editorfunctionaltests_-_6000_7_-_macos13:
-  name: InputSystem-EditorFunctionalTests - 6000.7 - MacOs13
-  agent:
-    image: package-ci/macos-13:v4
-    type: Unity::VM::osx
-    flavor: b1.xlarge
-  commands:
-  - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
-  - command: unity-downloader-cli -u trunk -c Editor --fast --wait
-  - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.7_project;flags:inputsystem_MacOS_6000.7_project" --timeout=3600 --artifacts-path=artifacts
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    artifacts:
-      paths:
-      - artifacts/**/*
-
 # InputSystem-EditorFunctionalTests - 6000.7 - MacOs13Arm
 inputsystem-editorfunctionaltests_-_6000_7_-_macos13arm:
   name: InputSystem-EditorFunctionalTests - 6000.7 - MacOs13Arm
diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml
index 57258ee860..c4ecbfbb46 100644
--- a/.yamato/input-system-editor-performance-tests.yml
+++ b/.yamato/input-system-editor-performance-tests.yml
@@ -226,24 +226,6 @@ inputsystem-editorperformancetests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-EditorPerformanceTests - 6000.7 - MacOs13
-inputsystem-editorperformancetests_-_6000_7_-_macos13:
-  name: InputSystem-EditorPerformanceTests - 6000.7 - MacOs13
-  agent:
-    image: package-ci/macos-13:v4
-    type: Unity::VM::osx
-    flavor: b1.xlarge
-  commands:
-  - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
-  - command: unity-downloader-cli -u trunk -c Editor --fast --wait
-  - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    artifacts:
-      paths:
-      - artifacts/**/*
-
 # InputSystem-EditorPerformanceTests - 6000.7 - MacOs13Arm
 inputsystem-editorperformancetests_-_6000_7_-_macos13arm:
   name: InputSystem-EditorPerformanceTests - 6000.7 - MacOs13Arm
diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml
index 8097d841a2..8cf12c9923 100644
--- a/.yamato/input-system-standalone-functional-tests.yml
+++ b/.yamato/input-system-standalone-functional-tests.yml
@@ -226,24 +226,6 @@ inputsystem-standalonefunctionaltests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandaloneFunctionalTests - 6000.7 - MacOs13
-inputsystem-standalonefunctionaltests_-_6000_7_-_macos13:
-  name: InputSystem-StandaloneFunctionalTests - 6000.7 - MacOs13
-  agent:
-    image: package-ci/macos-13:v4
-    type: Unity::VM::osx
-    flavor: b1.xlarge
-  commands:
-  - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
-  - command: unity-downloader-cli -u trunk -c Editor --fast --wait
-  - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    artifacts:
-      paths:
-      - artifacts/**/*
-
 # InputSystem-StandaloneFunctionalTests - 6000.7 - MacOs13Arm
 inputsystem-standalonefunctionaltests_-_6000_7_-_macos13arm:
   name: InputSystem-StandaloneFunctionalTests - 6000.7 - MacOs13Arm
diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml
index e3b495032b..303d7e4aed 100644
--- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml
+++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml
@@ -226,24 +226,6 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandaloneIl2CppFunctionalTests - 6000.7 - MacOs13
-inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13:
-  name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.7 - MacOs13
-  agent:
-    image: package-ci/macos-13:v4
-    type: Unity::VM::osx
-    flavor: b1.xlarge
-  commands:
-  - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
-  - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait
-  - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    artifacts:
-      paths:
-      - artifacts/**/*
-
 # InputSystem-StandaloneIl2CppFunctionalTests - 6000.7 - MacOs13Arm
 inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13arm:
   name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.7 - MacOs13Arm
diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml
index 2aa6b66ae9..eac47ec767 100644
--- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml
+++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml
@@ -226,24 +226,6 @@ inputsystem-standaloneil2cppperformancetests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandaloneIl2CppPerformanceTests - 6000.7 - MacOs13
-inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13:
-  name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.7 - MacOs13
-  agent:
-    image: package-ci/macos-13:v4
-    type: Unity::VM::osx
-    flavor: b1.xlarge
-  commands:
-  - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
-  - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait
-  - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    artifacts:
-      paths:
-      - artifacts/**/*
-
 # InputSystem-StandaloneIl2CppPerformanceTests - 6000.7 - MacOs13Arm
 inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13arm:
   name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.7 - MacOs13Arm
diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml
index 72c4e6b992..f4b5ba51d9 100644
--- a/.yamato/input-system-standalone-performance-tests.yml
+++ b/.yamato/input-system-standalone-performance-tests.yml
@@ -226,24 +226,6 @@ inputsystem-standaloneperformancetests_-_6000_6_-_win10:
       paths:
       - artifacts/**/*
 
-# InputSystem-StandalonePerformanceTests - 6000.7 - MacOs13
-inputsystem-standaloneperformancetests_-_6000_7_-_macos13:
-  name: InputSystem-StandalonePerformanceTests - 6000.7 - MacOs13
-  agent:
-    image: package-ci/macos-13:v4
-    type: Unity::VM::osx
-    flavor: b1.xlarge
-  commands:
-  - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
-  - command: unity-downloader-cli -u trunk -c Editor --fast --wait
-  - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    artifacts:
-      paths:
-      - artifacts/**/*
-
 # InputSystem-StandalonePerformanceTests - 6000.7 - MacOs13Arm
 inputsystem-standaloneperformancetests_-_6000_7_-_macos13arm:
   name: InputSystem-StandalonePerformanceTests - 6000.7 - MacOs13Arm
diff --git a/.yamato/test-samples.yml b/.yamato/test-samples.yml
index d639ba6458..bb446e3cc5 100644
--- a/.yamato/test-samples.yml
+++ b/.yamato/test-samples.yml
@@ -5,11 +5,15 @@ test_sample_projects_{{ editor.version }}:
   name : Test Sample Projects {{ editor.version }}
   agent:
     type: Unity::VM::osx
-    image: package-ci/macos-12:default
-    flavor: m1.mac
+    image: package-ci/macos-13:v4
+    flavor: b1.xlarge
   commands:
     - {{ upm_ci_install }}
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
+    - curl -fsSL https://dot.net/v1/dotnet-install.sh -o /tmp/dotnet-install.sh
+    - sudo bash /tmp/dotnet-install.sh --channel 6.0 --runtime dotnet --install-dir /usr/local/share/dotnet
+    - sudo bash /tmp/dotnet-install.sh --channel 8.0 --runtime dotnet --install-dir /usr/local/share/dotnet
+    - ls /usr/local/share/dotnet/shared/ 2>&1 || echo "WARNING dotnet shared directory not found"
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
     - Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh 
   triggers:
diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml
index bc7b1e6543..7a66120130 100644
--- a/.yamato/triggers.yml
+++ b/.yamato/triggers.yml
@@ -19,7 +19,6 @@ all_functional_tests:
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos13arm
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu2204
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_win10
-  - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_macos13
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_7_-_win10
@@ -55,7 +54,6 @@ all_functional_tests:
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos13arm
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu2204
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_win10
-  - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_7_-_win10
@@ -67,7 +65,6 @@ all_functional_tests:
   - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_win10
   - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13arm
   - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_win10
-  - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_7_-_win10
   - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem
@@ -93,7 +90,6 @@ all_performance_tests:
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos13arm
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_win10
-  - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_macos13
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_7_-_win10
@@ -129,7 +125,6 @@ all_performance_tests:
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13arm
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu2204
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_win10
-  - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_7_-_win10
@@ -145,7 +140,6 @@ all_performance_tests:
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos13arm
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu2204
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_win10
-  - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_macos13
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_macos13arm
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_ubuntu2204
   - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_7_-_win10
diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
index 4eaf427ac1..d79e36f29a 100644
--- a/.yamato/wrench/package-pack-jobs.yml
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -33,3 +33,28 @@ package_pack_-_inputsystem:
     Job Maintainers: '#rm-packageworks'
     Wrench: 3.2.1.0
 
+# Pack Package Manager DocTools
+package_pack_-_package-manager-doctools:
+  name: Package Pack - package-manager-doctools
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM::GPU
+    flavor: b1.large
+  commands:
+  - 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: upm-ci package pack --package-path Packages/com.unity.package-manager-doctools
+  - command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.package-manager-doctools_packages.json
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+  variables:
+    UPMCI_ACK_LARGE_PACKAGE: 1
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.2.1.0
+
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index a7e267b180..89fe792de1 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -151,16 +151,6 @@ publish_dry_run_inputsystem:
       UTR:
         location: results/UTR/validate-inputsystem-6000.6-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-inputsystem-6000.7-macos13
-        unzip: true
-      UTR:
-        location: results/UTR/validate-inputsystem-6000.7-macos13
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13arm
     specific_options:
       packages:
@@ -343,16 +333,6 @@ publish_inputsystem:
       UTR:
         location: results/UTR/validate-inputsystem-6000.6-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-inputsystem-6000.7-macos13
-        unzip: true
-      UTR:
-        location: results/UTR/validate-inputsystem-6000.7-macos13
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_7_-_macos13arm
     specific_options:
       packages:
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index 13f6c1f2a0..4170cd9944 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -883,79 +883,6 @@ validate_-_inputsystem_-_6000_6_-_win10:
   labels:
   - Packages:inputsystem
 
-# PVP Editor and Playmode tests for Validate - inputsystem - 6000.7 - macos13 (6000.7 - MacOS).
-validate_-_inputsystem_-_6000_7_-_macos13:
-  name: Validate - inputsystem - 6000.7 - macos13
-  agent:
-    image: package-ci/macos-13:v4
-    type: Unity::VM::osx
-    flavor: b1.xlarge
-  commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.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: unity-downloader-cli -u trunk -c editor --path .Editor --fast
-    timeout: 20
-    retries: 3
-  - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor
-    timeout: 10
-    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
-    retries: 0
-  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
-    timeout: 5
-    retries: 0
-  - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
-    timeout: 10
-    retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.7;flags:inputsystem_MacOS_6000.7" --coverage-pkg-version=1.3.0
-    timeout: 20
-    retries: 1
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
-  artifacts:
-    Coverage:
-      paths:
-      - upm-ci~/CodeCoverage/**
-    Crash Dumps:
-      paths:
-      - CrashDumps/**
-    packages:
-      paths:
-      - upm-ci~/packages/**/*
-    pvp-results:
-      paths:
-      - upm-ci~/pvp/**/*
-      browsable: onDemand
-    UTR:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - test-inputsystem/Logs/**
-      - test-inputsystem/Library/*.log
-      - test-inputsystem/*.log
-      - test-inputsystem/Builds/*.log
-      - build/test-results/**
-      browsable: onDemand
-  dependencies:
-  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem
-  variables:
-    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
-    UNITY_LICENSING_SERVER_DELETE_NUL: 0
-    UNITY_LICENSING_SERVER_DELETE_ULF: 0
-    UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 3.2.1.0
-  metadata:
-    Job Maintainers: '#rm-packageworks'
-    Wrench: 3.2.1.0
-  labels:
-  - Packages:inputsystem
-
 # PVP Editor and Playmode tests for Validate - inputsystem - 6000.7 - macos13arm (6000.7 - MacOS).
 validate_-_inputsystem_-_6000_7_-_macos13arm:
   name: Validate - inputsystem - 6000.7 - macos13arm
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
index b022f9c68a..c8c7e25686 100644
--- a/.yamato/wrench/wrench_config.json
+++ b/.yamato/wrench/wrench_config.json
@@ -38,6 +38,31 @@
         ]
       },
       "postPackCommands": []
+    },
+    "com.unity.package-manager-doctools": {
+      "directory": "Packages/com.unity.package-manager-doctools/",
+      "prePackCommands": [],
+      "preTestCommands": {
+        "MacOs13": [],
+        "MacOs13Arm": [],
+        "Ubuntu1804": [],
+        "Ubuntu2004": [],
+        "Ubuntu2204": [],
+        "Win10": [],
+        "Win10GPU": [],
+        "Win11": [],
+        "Win11Arm": [],
+        "Win11GPU": []
+      },
+      "InternalOnly": false,
+      "NeverPublish": false,
+      "MaxEditorVersion": "",
+      "coverageEnabled": false,
+      "coverageCommands": [
+        "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;"
+      ],
+      "dependantsToIgnoreInPreviewApv": {},
+      "postPackCommands": []
     }
   },
   "releasing_packages": [
diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs
index c8ddd55d8e..29d7221996 100644
--- a/Tools/CI/Settings/InputSystemSettings.cs
+++ b/Tools/CI/Settings/InputSystemSettings.cs
@@ -152,8 +152,8 @@ private void OverridePackagePlatform(WrenchPackage package)
                 = new EditorPlatform(EditorPlatformType.Win10,
                 new Agent("package-ci/win10:v4", FlavorType.BuildLarge, ResourceType.Vm));
 
-            // Unity 6.6 defaults to MacOs13Arm in Wrench 2.12.0 — don't override it back to Intel.
-            if (unityEditor.Version.Version != "6000.6")
+            // Unity 6.6+ defaults to MacOs13Arm in Wrench 2.12.0 — don't override it back to Intel.
+            if (unityEditor.Version.Version != "6000.6" && unityEditor.Version.Version != "6000.7")
             {
                 unityEditor.EditorPlatforms.Items[EditorPlatformType.MacOs13]
                     = new EditorPlatform(EditorPlatformType.MacOs13,