diff --git a/config/chromeos_config.py b/config/chromeos_config.py
index 9fb5f4d..cbb580e 100644
--- a/config/chromeos_config.py
+++ b/config/chromeos_config.py
@@ -2084,7 +2084,6 @@
       'nyan_big',
       'nyan_blaze',
       'nyan_kitty',
-      'oak',
       'octavius',
       'octopus',
       'panther',
diff --git a/config/config_dump.json b/config/config_dump.json
index a51db32..d970c61 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -50895,7 +50895,6 @@
             "nyan_blaze-paladin",
             "nyan_kitty-full-compile-paladin",
             "nyan_kitty-paladin",
-            "oak-paladin",
             "octavius-paladin",
             "octopus-paladin",
             "panther-paladin",
@@ -51028,7 +51027,6 @@
             "nyan_blaze-paladin-tryjob",
             "nyan_kitty-full-compile-paladin-tryjob",
             "nyan_kitty-paladin-tryjob",
-            "oak-paladin-tryjob",
             "octavius-paladin-tryjob",
             "octopus-paladin-tryjob",
             "panther-paladin-tryjob",
@@ -51211,7 +51209,6 @@
             "nyan_big-postsubmit",
             "nyan_blaze-postsubmit",
             "nyan_kitty-postsubmit",
-            "oak-postsubmit",
             "octavius-postsubmit",
             "octopus-postsubmit",
             "orco-postsubmit",
@@ -51366,7 +51363,6 @@
             "nyan_big-postsubmit-tryjob",
             "nyan_blaze-postsubmit-tryjob",
             "nyan_kitty-postsubmit-tryjob",
-            "oak-postsubmit-tryjob",
             "octavius-postsubmit-tryjob",
             "octopus-postsubmit-tryjob",
             "orco-postsubmit-tryjob",
diff --git a/config/waterfall_layout_dump.txt b/config/waterfall_layout_dump.txt
index 4542c72..930147b 100644
--- a/config/waterfall_layout_dump.txt
+++ b/config/waterfall_layout_dump.txt
@@ -110,7 +110,6 @@
     nyan_blaze-paladin
     nyan_kitty-full-compile-paladin
     nyan_kitty-paladin
-    oak-paladin
     octavius-paladin
     octopus-paladin
     panther-paladin
@@ -490,7 +489,6 @@
     nyan_big-postsubmit
     nyan_blaze-postsubmit
     nyan_kitty-postsubmit
-    oak-postsubmit
     octavius-postsubmit
     octopus-postsubmit
     orco-postsubmit
@@ -2698,7 +2696,6 @@
     nyan_blaze-paladin-tryjob
     nyan_kitty-full-compile-paladin-tryjob
     nyan_kitty-paladin-tryjob
-    oak-paladin-tryjob
     octavius-paladin-tryjob
     octopus-paladin-tryjob
     panther-paladin-tryjob
@@ -2823,7 +2820,6 @@
     nyan_big-postsubmit-tryjob
     nyan_blaze-postsubmit-tryjob
     nyan_kitty-postsubmit-tryjob
-    oak-postsubmit-tryjob
     octavius-postsubmit-tryjob
     octopus-postsubmit-tryjob
     orco-postsubmit-tryjob