diff --git a/config/config_dump.json b/config/config_dump.json
index 22c4907..2ed4cc5 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -16325,6 +16325,19 @@
             "grunt-arc64"
         ],
         "important": false,
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"aleena\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"barla\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"careena\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"grunt\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"kasumi\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"kasumi360\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"liara\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"nuwani\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"nuwani360\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"treeya\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"treeya360\",\n    \"test_suites\": []\n}"
+        ],
         "vm_tests": [],
         "vm_tests_override": null
     },
@@ -16346,6 +16359,19 @@
         ],
         "hw_tests_override": null,
         "luci_builder": "Try",
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"aleena\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"barla\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"careena\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"grunt\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"kasumi\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"kasumi360\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"liara\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"nuwani\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"nuwani360\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"treeya\",\n    \"test_suites\": []\n}",
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"grunt-arc64\",\n    \"name\": \"treeya360\",\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 ed3bb1a..5810fb6 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -482,18 +482,6 @@
       ]
     },
     {
-      "name": "grunt-arc64",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": true,
-          "leader_board": false,
-          "board_group": "",
-          "arch": "X86_INTERNAL"
-        }
-      ]
-    },
-    {
       "name": "guado",
       "configs": [
         {
@@ -2430,6 +2418,103 @@
       ]
     },
     {
+      "name": "grunt-arc64",
+      "reference_board_name": "grunt-arc64",
+      "arch": "X86_INTERNAL",
+      "builder": "RELEASE",
+      "experimental": true,
+      "models": [
+        {
+          "board_name": "grunt-arc64",
+          "name": "aleena",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "barla",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "careena",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "grunt",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "kasumi",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "kasumi360",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "liara",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "nuwani",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "nuwani360",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "treeya",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        },
+        {
+          "board_name": "grunt-arc64",
+          "name": "treeya360",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 7153,
+          "is_active": true
+        }
+      ]
+    },
+    {
       "name": "grunt-kernelnext",
       "reference_board_name": "grunt-kernelnext",
       "arch": "X86_INTERNAL",