diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index f13202c..466df4c 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -12374,6 +12374,7 @@
     },
     "lakitu-gpu-release": {
         "_template": "release",
+        "active_waterfall": "chromeos_release",
         "afdo_use": false,
         "boards": [
             "lakitu-gpu"
@@ -12401,6 +12402,7 @@
             "recovery",
             "test"
         ],
+        "important": true,
         "sign_types": [
             "base"
         ],
@@ -14591,6 +14593,7 @@
             "kefka-release",
             "kevin-release",
             "kip-release",
+            "lakitu-gpu-release",
             "lakitu-release",
             "lars-release",
             "leon-release",
diff --git a/cbuildbot/ge_build_config.json b/cbuildbot/ge_build_config.json
index 917d5d4..0cc0c0d 100644
--- a/cbuildbot/ge_build_config.json
+++ b/cbuildbot/ge_build_config.json
@@ -446,6 +446,18 @@
       ]
     },
     {
+      "name": "lakitu-gpu",
+      "configs": [
+        {
+          "builder": "RELEASE",
+          "experimental": false,
+          "leader_board": false,
+          "board_group": "",
+          "arch": "UNKNOWN"
+        }
+      ]
+    },
+    {
       "name": "lars",
       "configs": [
         {
diff --git a/cbuildbot/waterfall_layout_dump.txt b/cbuildbot/waterfall_layout_dump.txt
index a6a3394..31e611e 100644
--- a/cbuildbot/waterfall_layout_dump.txt
+++ b/cbuildbot/waterfall_layout_dump.txt
@@ -136,6 +136,7 @@
 kefka-release (gce_beefy)
 kevin-release (gce_beefy)
 kip-release (gce_beefy)
+lakitu-gpu-release (baremetal)
 lakitu-release (baremetal)
 lars-release (gce_beefy)
 leon-release (gce_beefy)