diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 36ee4ea..739a021 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -33823,7 +33823,6 @@
     },
     "jadeite-release": {
         "_template": "release",
-        "active_waterfall": "chromeos",
         "boards": [
             "jadeite"
         ],
@@ -43515,7 +43514,6 @@
             "guado_moblab-release",
             "hana-release",
             "heli-release",
-            "jadeite-release",
             "jecht-release",
             "kahlee-release",
             "kefka-release",
@@ -43688,7 +43686,6 @@
             "guado_moblab-release",
             "hana-release",
             "heli-release",
-            "jadeite-release",
             "jecht-release",
             "kahlee-release",
             "kefka-release",
diff --git a/cbuildbot/ge_build_config.json b/cbuildbot/ge_build_config.json
index ecfc5e4..6ed57b1 100644
--- a/cbuildbot/ge_build_config.json
+++ b/cbuildbot/ge_build_config.json
@@ -722,18 +722,6 @@
       ]
     },
     {
-      "name": "jadeite",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": true,
-          "leader_board": true,
-          "board_group": "",
-          "arch": "X86_INTERNAL"
-        }
-      ]
-    },
-    {
       "name": "jecht",
       "configs": [
         {
diff --git a/cbuildbot/waterfall_layout_dump.txt b/cbuildbot/waterfall_layout_dump.txt
index 3008afe..b98b7bb 100644
--- a/cbuildbot/waterfall_layout_dump.txt
+++ b/cbuildbot/waterfall_layout_dump.txt
@@ -134,7 +134,6 @@
 hana-release (gce_beefy)
 heli-release (gce_beefy)
 incremental-paladin (gce_beefy)
-jadeite-release (gce_beefy)
 jecht-release (gce_beefy)
 kahlee-paladin (gce_beefy)
 kahlee-release (gce_beefy)