diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 7acf428..fb3a181 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -357,6 +357,7 @@
     'veyron_mickey',
     'veyron_mighty',
     'veyron_minnie',
+    'veyron_minnie-cheets',
     'veyron_pinky',
     'veyron_rialto',
     'veyron_romy',
@@ -604,7 +605,7 @@
         'storm-release-group',
         'strago-release-group',
         'strago-b-release-group',
-        'veyron-c-release-group',
+        'veyron-d-release-group',
 
         # Experimental Canaries
         'bobcat-release',
@@ -2580,15 +2581,16 @@
       'veyron-c', 'veyron_brain', (
           'veyron_danger',
           'veyron_thea',
-          'veyron_shark',
+          'veyron_mickey',
       ),
-      important=False,
   )
 
   _AddGroupConfig(
-      'veyron-d', 'veyron_mickey', (
+      'veyron-d', 'veyron_shark', (
           'veyron_romy',
+          'veyron_minnie-cheets',
       ),
+      important=False,
   )
 
   # jecht-based boards
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index b7cda83..a016e23 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -20440,12 +20440,12 @@
             {
                 "_template": "full",
                 "boards": [
-                    "veyron_shark"
+                    "veyron_mickey"
                 ],
                 "build_packages_in_background": true,
                 "chrome_sdk_build_chrome": false,
                 "grouped": true,
-                "name": "veyron_shark-full",
+                "name": "veyron_mickey-full",
                 "prebuilts": "public",
                 "unittests": null,
                 "useflags": [
@@ -20454,7 +20454,7 @@
                 "vm_tests": []
             }
         ],
-        "description": "Full Builds; Group config (boards: veyron_brain, veyron_danger, veyron_thea, veyron_shark)",
+        "description": "Full Builds; Group config (boards: veyron_brain, veyron_danger, veyron_thea, veyron_mickey)",
         "prebuilts": "public",
         "useflags": [
             "-chrome_internal"
@@ -20504,32 +20504,34 @@
             {
                 "_template": "release",
                 "boards": [
-                    "veyron_shark"
+                    "veyron_mickey"
                 ],
                 "build_packages_in_background": true,
                 "chrome_sdk_build_chrome": false,
                 "grouped": true,
-                "name": "veyron_shark-release",
+                "hw_tests": [],
+                "name": "veyron_mickey-release",
                 "unittests": null,
                 "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: veyron_brain, veyron_danger, veyron_thea, veyron_shark)",
+        "description": "Release Builds (canary) (internal); Group config (boards: veyron_brain, veyron_danger, veyron_thea, veyron_mickey)",
+        "important": true,
         "vm_tests": []
     },
     "veyron-d-full-group": {
         "_template": "full",
         "boards": [
-            "veyron_mickey"
+            "veyron_shark"
         ],
         "child_configs": [
             {
                 "_template": "full",
                 "boards": [
-                    "veyron_mickey"
+                    "veyron_shark"
                 ],
                 "grouped": true,
-                "name": "veyron_mickey-full",
+                "name": "veyron_shark-full",
                 "prebuilts": "public",
                 "useflags": [
                     "-chrome_internal"
@@ -20551,9 +20553,25 @@
                     "-chrome_internal"
                 ],
                 "vm_tests": []
+            },
+            {
+                "_template": "full",
+                "boards": [
+                    "veyron_minnie-cheets"
+                ],
+                "build_packages_in_background": true,
+                "chrome_sdk_build_chrome": false,
+                "grouped": true,
+                "name": "veyron_minnie-cheets-full",
+                "prebuilts": "public",
+                "unittests": null,
+                "useflags": [
+                    "-chrome_internal"
+                ],
+                "vm_tests": []
             }
         ],
-        "description": "Full Builds; Group config (boards: veyron_mickey, veyron_romy)",
+        "description": "Full Builds; Group config (boards: veyron_shark, veyron_romy, veyron_minnie-cheets)",
         "prebuilts": "public",
         "useflags": [
             "-chrome_internal"
@@ -20564,17 +20582,16 @@
         "_template": "release",
         "active_waterfall": "chromeos",
         "boards": [
-            "veyron_mickey"
+            "veyron_shark"
         ],
         "child_configs": [
             {
                 "_template": "release",
                 "boards": [
-                    "veyron_mickey"
+                    "veyron_shark"
                 ],
                 "grouped": true,
-                "hw_tests": [],
-                "name": "veyron_mickey-release",
+                "name": "veyron_shark-release",
                 "vm_tests": []
             },
             {
@@ -20589,11 +20606,21 @@
                 "name": "veyron_romy-release",
                 "unittests": null,
                 "vm_tests": []
+            },
+            {
+                "_template": "release",
+                "boards": [
+                    "veyron_minnie-cheets"
+                ],
+                "build_packages_in_background": true,
+                "chrome_sdk_build_chrome": false,
+                "grouped": true,
+                "name": "veyron_minnie-cheets-release",
+                "unittests": null,
+                "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: veyron_mickey, veyron_romy)",
-        "hw_tests": [],
-        "important": true,
+        "description": "Release Builds (canary) (internal); Group config (boards: veyron_shark, veyron_romy, veyron_minnie-cheets)",
         "vm_tests": []
     },
     "veyron-full-group": {
@@ -21912,6 +21939,173 @@
         ],
         "vm_tests": []
     },
+    "veyron_minnie-cheets-chrome-pfq": {
+        "_template": "chrome-pfq",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "important": false,
+        "manifest": "official.xml",
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-chromium-pfq": {
+        "_template": "chromium-pfq",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "description": "Preflight Chromium Uprev & Build (internal)",
+        "doc": "http://www.chromium.org/chromium-os/build/builder-overview#TOC-Chrome-PFQ",
+        "important": false,
+        "internal": true,
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "prebuilts": "public",
+        "useflags": [
+            "-chrome_internal"
+        ],
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-compile-only-pre-cq": {
+        "_template": "compile-only-pre-cq",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "internal": true,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "useflags": [
+            "chrome_internal"
+        ]
+    },
+    "veyron_minnie-cheets-full": {
+        "_template": "full",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "prebuilts": "public",
+        "useflags": [
+            "-chrome_internal"
+        ],
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-no-vmtest-pre-cq": {
+        "_template": "no-vmtest-pre-cq",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "internal": true,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "useflags": [
+            "chrome_internal"
+        ]
+    },
+    "veyron_minnie-cheets-paladin": {
+        "_template": "paladin",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "description": "Commit Queue (internal)",
+        "important": false,
+        "internal": true,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "prebuilts": "private",
+        "useflags": [
+            "chrome_internal"
+        ],
+        "vm_tests": [],
+        "vm_tests_override": null
+    },
+    "veyron_minnie-cheets-payloads": {
+        "_template": "payloads",
+        "boards": [
+            "veyron_minnie-cheets"
+        ]
+    },
+    "veyron_minnie-cheets-pre-cq": {
+        "_template": "pre-cq",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "internal": true,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "useflags": [
+            "chrome_internal"
+        ],
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-release": {
+        "_template": "release",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-release-afdo": {
+        "_template": "release-afdo-generate",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "child_configs": [
+            {
+                "_template": "release-afdo-generate",
+                "boards": [
+                    "veyron_minnie-cheets"
+                ],
+                "grouped": true,
+                "name": "veyron_minnie-cheets-release-afdo-generate",
+                "vm_tests": []
+            },
+            {
+                "_template": "release-afdo-use",
+                "boards": [
+                    "veyron_minnie-cheets"
+                ],
+                "grouped": true,
+                "name": "veyron_minnie-cheets-release-afdo-use",
+                "vm_tests": []
+            }
+        ],
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-release-afdo-generate": {
+        "_template": "release-afdo-generate",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-release-afdo-use": {
+        "_template": "release-afdo-use",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-tot-chrome-pfq-informational": {
+        "_template": "chrome-pfq-informational",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "manifest": "official.xml",
+        "vm_tests": []
+    },
+    "veyron_minnie-cheets-tot-chromium-pfq-informational": {
+        "_template": "chromium-pfq-informational",
+        "boards": [
+            "veyron_minnie-cheets"
+        ],
+        "useflags": [
+            "-chrome_internal"
+        ],
+        "vm_tests": []
+    },
     "veyron_minnie-chrome-pfq": {
         "_template": "chrome-pfq",
         "boards": [