diff --git a/cbuildbot/cbuildbot_config.py b/cbuildbot/cbuildbot_config.py
index 27b2d09..9f5060b 100755
--- a/cbuildbot/cbuildbot_config.py
+++ b/cbuildbot/cbuildbot_config.py
@@ -3274,6 +3274,7 @@
       'arm-generic-full',
       'daisy-full',
       'mipsel-o32-generic-full',
+      'oak-full',
       'x86-generic-full',
 
       # ASAN
@@ -3289,6 +3290,7 @@
       # Experimental Paladins
       'daisy_freon-paladin',
       'nyan_freon-paladin',
+      'oak-paladin',
       'tricky-paladin',
       'whirlwind-paladin',
       'x86-alex_freon-paladin',
@@ -3310,6 +3312,7 @@
       'daisy_winter-release',
       'kayle-release',
       'nyan_freon-release',
+      'oak-release',
       'panther_moblab-release',
       'rush_ryu-release',
       'lakitu-release',
diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 35ac93f..7a8de42 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -32892,6 +32892,7 @@
         "vm_tests": []
     },
     "oak-full": {
+        "active_waterfall": "chromiumos",
         "archive_build_debug": true,
         "boards": [
             "oak"
@@ -32955,6 +32956,7 @@
         "vm_tests": []
     },
     "oak-paladin": {
+        "active_waterfall": "chromeos",
         "boards": [
             "oak"
         ],
@@ -33030,6 +33032,7 @@
         "vm_tests": []
     },
     "oak-release": {
+        "active_waterfall": "chromeos",
         "afdo_use": true,
         "archive_build_debug": true,
         "binhost_base_url": "https://commondatastorage.googleapis.com/chromeos-dev-installer",