diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 55bbfaa..94620ae 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -1754,9 +1754,7 @@
       (MONTHLY, 'firmware-gandof-6301.155.B', ['gandof'], {}),
       (MONTHLY, 'firmware-buddy-6301.202.B', ['buddy'], {}),
       (MONTHLY, 'firmware-veyron-6588.B', [
-          'veyron_mighty',
-          'veyron_speedy', 'veyron_jaq',
-          'veyron_minnie',
+          'veyron_mighty', 'veyron_speedy', 'veyron_minnie',
           'veyron_mickey', 'veyron_rialto', 'veyron_tiger',
           'veyron_fievel'], {}),
       (MONTHLY, 'firmware-glados-7820.B', [
@@ -1843,8 +1841,7 @@
           'gandof', 'buddy']),
       (MONTHLY, 'factory-whirlwind-6509.B', ['whirlwind']),
       (MONTHLY, 'factory-veyron-6591.B', [
-          'veyron_mighty',
-          'veyron_speedy', 'veyron_jaq',
+          'veyron_mighty', 'veyron_speedy',
           'veyron_minnie', 'veyron_mickey']),
       (MONTHLY, 'factory-auron-6772.B', [
           'guado', 'tidus', 'rikku', 'buddy']),
diff --git a/config/chromeos_config_boards.py b/config/chromeos_config_boards.py
index 4d7bcf8..d2960d4 100644
--- a/config/chromeos_config_boards.py
+++ b/config/chromeos_config_boards.py
@@ -33,7 +33,6 @@
     'nyan_big',
     'nyan_blaze',
     'tael',
-    'veyron_jaq',
     'veyron_mighty',
     'veyron_minnie',
     'veyron_rialto',
diff --git a/config/config_dump.json b/config/config_dump.json
index 8790a21..ffdb987 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -12737,7 +12737,6 @@
         "display_label": "factory",
         "schedule": "with 720h interval",
         "slave_configs": [
-            "veyron_jaq-factory-veyron-6591.B-factorybranch",
             "veyron_mickey-factory-veyron-6591.B-factorybranch",
             "veyron_mighty-factory-veyron-6591.B-factorybranch",
             "veyron_minnie-factory-veyron-6591.B-factorybranch",
@@ -12753,7 +12752,6 @@
         "display_label": "tryjob",
         "luci_builder": "Try",
         "slave_configs": [
-            "veyron_jaq-factory-veyron-6591.B-factorybranch-tryjob",
             "veyron_mickey-factory-veyron-6591.B-factorybranch-tryjob",
             "veyron_mighty-factory-veyron-6591.B-factorybranch-tryjob",
             "veyron_minnie-factory-veyron-6591.B-factorybranch-tryjob",
@@ -14370,7 +14368,6 @@
         "boards": [
             "veyron_mighty",
             "veyron_speedy",
-            "veyron_jaq",
             "veyron_minnie",
             "veyron_mickey",
             "veyron_rialto",
@@ -14385,7 +14382,6 @@
         "boards": [
             "veyron_mighty",
             "veyron_speedy",
-            "veyron_jaq",
             "veyron_minnie",
             "veyron_mickey",
             "veyron_rialto",
@@ -35297,179 +35293,6 @@
             "chrome_internal"
         ]
     },
-    "veyron_jaq-factory-veyron-6591.B-factorybranch": {
-        "_template": "factorybranch",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "packages": [
-            "virtual/target-os",
-            "virtual/target-os-dev",
-            "virtual/target-os-test",
-            "chromeos-base/chromeos-installshim",
-            "chromeos-base/chromeos-factory",
-            "chromeos-base/chromeos-hwid",
-            "chromeos-base/autotest-factory-install",
-            "chromeos-base/autotest-all"
-        ],
-        "workspace_branch": "factory-veyron-6591.B"
-    },
-    "veyron_jaq-factory-veyron-6591.B-factorybranch-tryjob": {
-        "_template": "factorybranch",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "debug": true,
-        "display_label": "tryjob",
-        "hw_tests_override": null,
-        "luci_builder": "Try",
-        "packages": [
-            "virtual/target-os",
-            "virtual/target-os-dev",
-            "virtual/target-os-test",
-            "chromeos-base/chromeos-installshim",
-            "chromeos-base/chromeos-factory",
-            "chromeos-base/chromeos-hwid",
-            "chromeos-base/autotest-factory-install",
-            "chromeos-base/autotest-all"
-        ],
-        "push_image": false,
-        "suite_scheduling": false,
-        "workspace_branch": "factory-veyron-6591.B"
-    },
-    "veyron_jaq-full": {
-        "_template": "full",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "manifest_branch": "main",
-        "prebuilts": "public",
-        "run_cpeexport": true,
-        "useflags": [
-            "-chrome_internal"
-        ],
-        "vm_tests": []
-    },
-    "veyron_jaq-full-tryjob": {
-        "_template": "full",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "debug": true,
-        "display_label": "tryjob",
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"Build\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 0,\n    \"timeout\": 10800,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"Build\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-arc\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 0,\n    \"timeout\": 10800,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"Build\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-tast-cq\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 0,\n    \"timeout\": 10800,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-tast-informational\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-installer\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-perbuild\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}"
-        ],
-        "hw_tests_override": null,
-        "luci_builder": "Try",
-        "manifest_branch": "main",
-        "prebuilts": "public",
-        "run_cpeexport": true,
-        "useflags": [
-            "-chrome_internal"
-        ],
-        "vm_tests": []
-    },
-    "veyron_jaq-llvm-next-toolchain": {
-        "_template": "llvm_next_toolchain",
-        "boards": [
-            "veyron_jaq"
-        ]
-    },
-    "veyron_jaq-llvm-next-toolchain-tryjob": {
-        "_template": "llvm_next_toolchain",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "debug": true,
-        "display_label": "tryjob",
-        "hw_tests_override": null,
-        "luci_builder": "Try"
-    },
-    "veyron_jaq-llvm-toolchain": {
-        "_template": "llvm_toolchain",
-        "boards": [
-            "veyron_jaq"
-        ]
-    },
-    "veyron_jaq-llvm-toolchain-tryjob": {
-        "_template": "llvm_toolchain",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "debug": true,
-        "display_label": "tryjob",
-        "hw_tests_override": null,
-        "luci_builder": "Try"
-    },
-    "veyron_jaq-payloads": {
-        "_template": "payloads",
-        "boards": [
-            "veyron_jaq"
-        ]
-    },
-    "veyron_jaq-payloads-tryjob": {
-        "_template": "payloads",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "debug": true,
-        "hw_tests_override": null,
-        "luci_builder": "Try"
-    },
-    "veyron_jaq-release": {
-        "_template": "release",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "vm_tests": [],
-        "vm_tests_override": null
-    },
-    "veyron_jaq-release-tryjob": {
-        "_template": "release",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "debug": true,
-        "display_label": "tryjob",
-        "hw_tests": [
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"Build\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-inline\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 0,\n    \"timeout\": 10800,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"Build\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-arc\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 0,\n    \"timeout\": 10800,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": false,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"Build\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-tast-cq\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 0,\n    \"timeout\": 10800,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-tast-informational\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-installer\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-cq\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}",
-            "{\n    \"async\": true,\n    \"blocking\": false,\n    \"critical\": false,\n    \"enable_skylab\": true,\n    \"file_bugs\": false,\n    \"max_retries\": 5,\n    \"minimum_duts\": 0,\n    \"offload_failures_only\": false,\n    \"pool\": \"quota\",\n    \"priority\": \"PostBuild\",\n    \"quota_account\": \"legacypool-suites\",\n    \"retry\": true,\n    \"suite\": \"bvt-perbuild\",\n    \"suite_args\": null,\n    \"suite_min_duts\": 1,\n    \"timeout\": 15000,\n    \"warn_only\": false\n}"
-        ],
-        "hw_tests_override": null,
-        "luci_builder": "Try",
-        "paygen": false,
-        "push_image": false,
-        "suite_scheduling": false,
-        "vm_tests": [],
-        "vm_tests_override": null
-    },
-    "veyron_jaq-unittest-stress": {
-        "_template": "unittest_stress",
-        "boards": [
-            "veyron_jaq"
-        ],
-        "hw_tests_override": null,
-        "internal": true,
-        "luci_builder": "Try",
-        "manifest": "official.xml",
-        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
-        "overlays": "both",
-        "useflags": [
-            "chrome_internal"
-        ]
-    },
     "veyron_mickey-factory-veyron-6591.B-factorybranch": {
         "_template": "factorybranch",
         "boards": [
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index ff4a022..95e4fee 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -117,7 +117,6 @@
     strongbad-factory-trogdor-13443.B-factorybranch
     trogdor-factory-trogdor-13443.B-factorybranch
   factory-veyron-6591.B-buildspec
-    veyron_jaq-factory-veyron-6591.B-factorybranch
     veyron_mickey-factory-veyron-6591.B-factorybranch
     veyron_mighty-factory-veyron-6591.B-factorybranch
     veyron_minnie-factory-veyron-6591.B-factorybranch
@@ -999,7 +998,6 @@
     strongbad-factory-trogdor-13443.B-factorybranch-tryjob
     trogdor-factory-trogdor-13443.B-factorybranch-tryjob
   factory-veyron-6591.B-buildspec-tryjob
-    veyron_jaq-factory-veyron-6591.B-factorybranch-tryjob
     veyron_mickey-factory-veyron-6591.B-factorybranch-tryjob
     veyron_mighty-factory-veyron-6591.B-factorybranch-tryjob
     veyron_minnie-factory-veyron-6591.B-factorybranch-tryjob
@@ -2072,13 +2070,6 @@
   veyron_fievel-payloads-tryjob
   veyron_fievel-release-tryjob
   veyron_fievel-unittest-stress
-  veyron_jaq-factory-veyron-6591.B-factorybranch-tryjob
-  veyron_jaq-full-tryjob
-  veyron_jaq-llvm-next-toolchain-tryjob
-  veyron_jaq-llvm-toolchain-tryjob
-  veyron_jaq-payloads-tryjob
-  veyron_jaq-release-tryjob
-  veyron_jaq-unittest-stress
   veyron_mickey-factory-veyron-6591.B-factorybranch-tryjob
   veyron_mickey-factory-veyron-7505.B-factorybranch-tryjob
   veyron_mighty-factory-veyron-6591.B-factorybranch-tryjob