diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 6ab191a..bf06c58 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -21316,14 +21316,12 @@
     },
     "storm-release": {
         "_template": "release",
-        "active_waterfall": "chromeos_release",
         "afdo_use": false,
         "boards": [
             "storm"
         ],
         "chrome_sdk": false,
         "dev_installer_prebuilts": false,
-        "important": true,
         "paygen_skip_testing": true,
         "signer_tests": false,
         "sync_chrome": false,
@@ -26059,9 +26057,7 @@
         "boards": [
             "whirlwind"
         ],
-        "buildslave_type": "gce_beefy",
         "chrome_sdk": false,
-        "chrome_sdk_build_chrome": false,
         "important": true,
         "sync_chrome": false,
         "vm_tests": [],
diff --git a/cbuildbot/ge_build_config.json b/cbuildbot/ge_build_config.json
index ace641e..6268020 100644
--- a/cbuildbot/ge_build_config.json
+++ b/cbuildbot/ge_build_config.json
@@ -746,18 +746,6 @@
       ]
     },
     {
-      "name": "storm",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": false,
-          "leader_board": true,
-          "board_group": "whirlwind",
-          "arch": "UNKNOWN"
-        }
-      ]
-    },
-    {
       "name": "stout",
       "configs": [
         {
@@ -967,7 +955,7 @@
         {
           "builder": "RELEASE",
           "experimental": false,
-          "leader_board": false,
+          "leader_board": true,
           "board_group": "whirlwind",
           "arch": "UNKNOWN"
         }
diff --git a/cbuildbot/waterfall_layout_dump.txt b/cbuildbot/waterfall_layout_dump.txt
index cdd1e60..50bfe07 100644
--- a/cbuildbot/waterfall_layout_dump.txt
+++ b/cbuildbot/waterfall_layout_dump.txt
@@ -152,7 +152,6 @@
 sentry-release (gce_beefy)
 setzer-release (gce_beefy)
 squawks-release (gce_beefy)
-storm-release (baremetal)
 stout-release (baremetal)
 stumpy-release (gce_beefy)
 sumo-release (gce_beefy)
@@ -170,7 +169,7 @@
 veyron_rialto-release (gce_beefy)
 veyron_speedy-release (gce_beefy)
 veyron_tiger-release (gce_beefy)
-whirlwind-release (gce_beefy)
+whirlwind-release (baremetal)
 winky-release (gce_beefy)
 wizpig-release (gce_beefy)
 wolf-release (gce_beefy)