diff --git a/cbuildbot/config_dump.json b/cbuildbot/config_dump.json
index 1911ed8..7f67904 100644
--- a/cbuildbot/config_dump.json
+++ b/cbuildbot/config_dump.json
@@ -12891,6 +12891,79 @@
         "image_test": false,
         "sync_chrome": false
     },
+    "lakitu-nc-chromium-pfq": {
+        "_template": "chromium_pfq",
+        "boards": [
+            "lakitu-nc"
+        ],
+        "buildslave_type": "baremetal",
+        "important": false,
+        "useflags": [
+            "-chrome_internal"
+        ]
+    },
+    "lakitu-nc-compile-only-pre-cq": {
+        "_template": "compile_only_pre_cq",
+        "boards": [
+            "lakitu-nc"
+        ]
+    },
+    "lakitu-nc-full": {
+        "_template": "full",
+        "boards": [
+            "lakitu-nc"
+        ],
+        "buildslave_type": "baremetal",
+        "prebuilts": "public",
+        "useflags": [
+            "-chrome_internal"
+        ]
+    },
+    "lakitu-nc-no-vmtest-pre-cq": {
+        "_template": "no_vmtest_pre_cq",
+        "boards": [
+            "lakitu-nc"
+        ]
+    },
+    "lakitu-nc-paladin": {
+        "_template": "paladin",
+        "boards": [
+            "lakitu-nc"
+        ],
+        "important": false,
+        "vm_tests": []
+    },
+    "lakitu-nc-pre-cq": {
+        "_template": "pre_cq",
+        "boards": [
+            "lakitu-nc"
+        ]
+    },
+    "lakitu-nc-release": {
+        "_template": "release",
+        "active_waterfall": "chromeos_release",
+        "boards": [
+            "lakitu-nc"
+        ],
+        "buildslave_type": "baremetal",
+        "important": true
+    },
+    "lakitu-nc-tot-chromium-pfq-informational": {
+        "_template": "chromium_pfq_informational",
+        "boards": [
+            "lakitu-nc"
+        ],
+        "buildslave_type": "baremetal",
+        "useflags": [
+            "-chrome_internal"
+        ]
+    },
+    "lakitu-nc-unittest-stress": {
+        "_template": "unittest_stress",
+        "boards": [
+            "lakitu-nc"
+        ]
+    },
     "lakitu-no-vmtest-pre-cq": {
         "_template": "no_vmtest_pre_cq",
         "boards": [
@@ -15213,6 +15286,7 @@
             "kevin-release",
             "kip-release",
             "lakitu-gpu-release",
+            "lakitu-nc-release",
             "lakitu-release",
             "lakitu-st-release",
             "lars-release",
diff --git a/cbuildbot/ge_build_config.json b/cbuildbot/ge_build_config.json
index 9a3a8a2..253dd32 100644
--- a/cbuildbot/ge_build_config.json
+++ b/cbuildbot/ge_build_config.json
@@ -470,6 +470,18 @@
       ]
     },
     {
+      "name": "lakitu-nc",
+      "configs": [
+        {
+          "builder": "RELEASE",
+          "experimental": false,
+          "leader_board": false,
+          "board_group": "",
+          "arch": "X86_INTERNAL"
+        }
+      ]
+    },
+    {
       "name": "lakitu-st",
       "configs": [
         {
diff --git a/cbuildbot/waterfall_layout_dump.txt b/cbuildbot/waterfall_layout_dump.txt
index c771e24..98617b0 100644
--- a/cbuildbot/waterfall_layout_dump.txt
+++ b/cbuildbot/waterfall_layout_dump.txt
@@ -163,6 +163,7 @@
 kevin-release (gce_beefy)
 kip-release (gce_beefy)
 lakitu-gpu-release (baremetal)
+lakitu-nc-release (baremetal)
 lakitu-release (baremetal)
 lakitu-st-release (baremetal)
 lars-release (gce_beefy)
@@ -541,6 +542,10 @@
 lakitu-gpu-payloads (gce_beefy)
 lakitu-gpu-pre-cq (baremetal)
 lakitu-gpu-unittest-stress (gce_beefy)
+lakitu-nc-compile-only-pre-cq (gce_beefy)
+lakitu-nc-no-vmtest-pre-cq (gce_beefy)
+lakitu-nc-pre-cq (gce_beefy)
+lakitu-nc-unittest-stress (gce_beefy)
 lakitu-no-vmtest-pre-cq (gce_beefy)
 lakitu-payloads (gce_beefy)
 lakitu-pre-cq (baremetal)