diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
index 469e2e708f..38ad4cfb8c 100644
--- a/.yamato/wrench/package-pack-jobs.yml
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -34,29 +34,3 @@ package_pack_-_inputsystem:
     Job Maintainers: '#rm-packageworks'
     Wrench: 3.13.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
-    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
-    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-20_6ace78b5de8cf4671628832afa80f64bddc76883d89b9781fa19478b4bb33732.zip
-  metadata:
-    Job Maintainers: '#rm-packageworks'
-    Wrench: 3.13.1.0
-
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
index 4e6e3d64ed..74bff1de8c 100644
--- a/.yamato/wrench/wrench_config.json
+++ b/.yamato/wrench/wrench_config.json
@@ -27,9 +27,6 @@
         "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;"
       ],
       "dependantsToIgnoreInPreviewApv": {
-        "6000.5": [
-          "com.unity.charactercontroller"
-        ],
         "6000.6": [
           "com.unity.charactercontroller"
         ],
@@ -38,31 +35,6 @@
         ]
       },
       "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 820630f4df..5da8ccb5d6 100644
--- a/Tools/CI/Settings/InputSystemSettings.cs
+++ b/Tools/CI/Settings/InputSystemSettings.cs
@@ -128,13 +128,6 @@ public InputSystemSettings()
         // We can remove them from this list once the issues are fixed on their end.
         InputSystemPackage.DependantsToIgnoreInPreviewApv = new Dictionary<Editor, ISet<string>>()
         {
-            {
-                new Editor("6000.5",  ""),
-                new HashSet<string>()
-                {
-                    "com.unity.charactercontroller"
-                }
-            },
             {
                 new Editor("6000.6",  ""),
                 new HashSet<string>()