diff --git a/cbuildbot/chromeos_config.py b/cbuildbot/chromeos_config.py
index 7fca076..01e6676 100644
--- a/cbuildbot/chromeos_config.py
+++ b/cbuildbot/chromeos_config.py
@@ -437,6 +437,7 @@
     'reks',
     'rikku',
     'samus',
+    'sentry',
     'slippy',
     'squawks',
     'stout',
@@ -2627,7 +2628,9 @@
   _AddGroupConfig(
       'kunimitsu', 'kunimitsu', (
           'lars',
+          'sentry',
       ),
+      important=False,
   )
 
   # Factory and Firmware releases much inherit from these classes.
@@ -2730,6 +2733,7 @@
       'reks',
       'rikku',
       'samus',
+      'sentry',
       'slippy',
       'smaug',
       'squawks',
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 176d9cb..12610b9 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -8935,9 +8935,25 @@
                     "-chrome_internal"
                 ],
                 "vm_tests": []
+            },
+            {
+                "_template": "full",
+                "boards": [
+                    "sentry"
+                ],
+                "build_packages_in_background": true,
+                "chrome_sdk_build_chrome": false,
+                "grouped": true,
+                "name": "sentry-full",
+                "prebuilts": "public",
+                "unittests": null,
+                "useflags": [
+                    "-chrome_internal"
+                ],
+                "vm_tests": []
             }
         ],
-        "description": "Full Builds; Group config (boards: kunimitsu, lars)",
+        "description": "Full Builds; Group config (boards: kunimitsu, lars, sentry)",
         "prebuilts": "public",
         "useflags": [
             "-chrome_internal"
@@ -9036,7 +9052,6 @@
     },
     "kunimitsu-release-group": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "boards": [
             "kunimitsu"
         ],
@@ -9060,10 +9075,21 @@
                 "name": "lars-release",
                 "unittests": null,
                 "vm_tests": []
+            },
+            {
+                "_template": "release",
+                "boards": [
+                    "sentry"
+                ],
+                "build_packages_in_background": true,
+                "chrome_sdk_build_chrome": false,
+                "grouped": true,
+                "name": "sentry-release",
+                "unittests": null,
+                "vm_tests": []
             }
         ],
-        "description": "Release Builds (canary) (internal); Group config (boards: kunimitsu, lars)",
-        "important": true
+        "description": "Release Builds (canary) (internal); Group config (boards: kunimitsu, lars, sentry)"
     },
     "kunimitsu-tot-chrome-pfq-informational": {
         "_template": "chrome-pfq-informational",
@@ -16505,6 +16531,171 @@
         "description": "Release Builds (canary) (internal); Group config (boards: parrot, lumpy, butterfly, stumpy)",
         "important": true
     },
+    "sentry-chrome-pfq": {
+        "_template": "chrome-pfq",
+        "boards": [
+            "sentry"
+        ],
+        "important": false,
+        "manifest": "official.xml"
+    },
+    "sentry-chromium-pfq": {
+        "_template": "chromium-pfq",
+        "boards": [
+            "sentry"
+        ],
+        "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"
+        ]
+    },
+    "sentry-compile-only-pre-cq": {
+        "_template": "compile-only-pre-cq",
+        "boards": [
+            "sentry"
+        ],
+        "internal": true,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "useflags": [
+            "chrome_internal"
+        ]
+    },
+    "sentry-firmware": {
+        "_template": "firmware",
+        "boards": [
+            "sentry"
+        ],
+        "manifest": "official.xml",
+        "useflags": [
+            "chrome_internal",
+            "chromeless_tty"
+        ]
+    },
+    "sentry-full": {
+        "_template": "full",
+        "boards": [
+            "sentry"
+        ],
+        "prebuilts": "public",
+        "useflags": [
+            "-chrome_internal"
+        ]
+    },
+    "sentry-no-vmtest-pre-cq": {
+        "_template": "no-vmtest-pre-cq",
+        "boards": [
+            "sentry"
+        ],
+        "internal": true,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "useflags": [
+            "chrome_internal"
+        ]
+    },
+    "sentry-paladin": {
+        "_template": "paladin",
+        "boards": [
+            "sentry"
+        ],
+        "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": []
+    },
+    "sentry-payloads": {
+        "_template": "payloads",
+        "boards": [
+            "sentry"
+        ]
+    },
+    "sentry-pre-cq": {
+        "_template": "pre-cq",
+        "boards": [
+            "sentry"
+        ],
+        "internal": true,
+        "manifest": "official.xml",
+        "manifest_repo_url": "https://chrome-internal-review.googlesource.com/chromeos/manifest-internal",
+        "overlays": "both",
+        "useflags": [
+            "chrome_internal"
+        ]
+    },
+    "sentry-release": {
+        "_template": "release",
+        "boards": [
+            "sentry"
+        ]
+    },
+    "sentry-release-afdo": {
+        "_template": "release-afdo-generate",
+        "boards": [
+            "sentry"
+        ],
+        "child_configs": [
+            {
+                "_template": "release-afdo-generate",
+                "boards": [
+                    "sentry"
+                ],
+                "grouped": true,
+                "name": "sentry-release-afdo-generate"
+            },
+            {
+                "_template": "release-afdo-use",
+                "boards": [
+                    "sentry"
+                ],
+                "grouped": true,
+                "name": "sentry-release-afdo-use"
+            }
+        ]
+    },
+    "sentry-release-afdo-generate": {
+        "_template": "release-afdo-generate",
+        "boards": [
+            "sentry"
+        ]
+    },
+    "sentry-release-afdo-use": {
+        "_template": "release-afdo-use",
+        "boards": [
+            "sentry"
+        ]
+    },
+    "sentry-tot-chrome-pfq-informational": {
+        "_template": "chrome-pfq-informational",
+        "boards": [
+            "sentry"
+        ],
+        "manifest": "official.xml"
+    },
+    "sentry-tot-chromium-pfq-informational": {
+        "_template": "chromium-pfq-informational",
+        "boards": [
+            "sentry"
+        ],
+        "useflags": [
+            "-chrome_internal"
+        ]
+    },
     "slippy-chrome-pfq": {
         "_template": "chrome-pfq",
         "boards": [