diff --git a/config/config_dump.json b/config/config_dump.json
index bd8e1b0..5a047be 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -9265,6 +9265,9 @@
             "elm-kernelnext"
         ],
         "important": false,
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"elm\",\n    \"name\": \"elm\",\n    \"test_suites\": []\n}"
+        ],
         "vm_tests": [],
         "vm_tests_override": null
     },
@@ -9286,6 +9289,9 @@
         ],
         "hw_tests_override": null,
         "luci_builder": "Try",
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"elm\",\n    \"name\": \"elm\",\n    \"test_suites\": []\n}"
+        ],
         "paygen": false,
         "push_image": false,
         "suite_scheduling": false,
@@ -9359,7 +9365,9 @@
         "boards": [
             "elm"
         ],
-        "chrome_sdk_build_chrome": false,
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"elm\",\n    \"name\": \"elm\",\n    \"test_suites\": []\n}"
+        ],
         "vm_tests": [],
         "vm_tests_override": null
     },
@@ -9368,7 +9376,6 @@
         "boards": [
             "elm"
         ],
-        "chrome_sdk_build_chrome": false,
         "debug": true,
         "display_label": "tryjob",
         "hw_tests": [
@@ -9382,6 +9389,9 @@
         ],
         "hw_tests_override": null,
         "luci_builder": "Try",
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"elm\",\n    \"name\": \"elm\",\n    \"test_suites\": []\n}"
+        ],
         "paygen": false,
         "push_image": false,
         "suite_scheduling": false,
diff --git a/config/ge_build_config.json b/config/ge_build_config.json
index 740e4e4..231ecd9 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -398,30 +398,6 @@
       ]
     },
     {
-      "name": "elm",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": false,
-          "leader_board": false,
-          "board_group": "oak",
-          "arch": "ARM_INTERNAL"
-        }
-      ]
-    },
-    {
-      "name": "elm-kernelnext",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": true,
-          "leader_board": false,
-          "board_group": "",
-          "arch": "ARM_INTERNAL"
-        }
-      ]
-    },
-    {
       "name": "enguarde",
       "configs": [
         {
@@ -1529,6 +1505,40 @@
       ]
     },
     {
+      "name": "elm",
+      "reference_board_name": "elm",
+      "arch": "ARM_INTERNAL",
+      "builder": "RELEASE",
+      "experimental": false,
+      "models": [
+        {
+          "board_name": "elm",
+          "name": "elm",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 265,
+          "is_active": true
+        }
+      ]
+    },
+    {
+      "name": "elm-kernelnext",
+      "reference_board_name": "elm-kernelnext",
+      "arch": "ARM_INTERNAL",
+      "builder": "RELEASE",
+      "experimental": true,
+      "models": [
+        {
+          "board_name": "elm-kernelnext",
+          "name": "elm",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 425,
+          "is_active": true
+        }
+      ]
+    },
+    {
       "name": "endeavour",
       "reference_board_name": "endeavour",
       "arch": "X86_INTERNAL",