diff --git a/config/config_dump.json b/config/config_dump.json
index 2e93087..f8147d9 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -2103,8 +2103,10 @@
         "boards": [
             "atlas-arm64"
         ],
-        "chrome_sdk_build_chrome": false,
         "important": false,
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas-arm64\",\n    \"name\": \"atlas\",\n    \"test_suites\": []\n}"
+        ],
         "vm_tests": [],
         "vm_tests_override": null
     },
@@ -2113,7 +2115,6 @@
         "boards": [
             "atlas-arm64"
         ],
-        "chrome_sdk_build_chrome": false,
         "debug": true,
         "display_label": "tryjob",
         "hw_tests": [
@@ -2127,6 +2128,9 @@
         ],
         "hw_tests_override": null,
         "luci_builder": "Try",
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas-arm64\",\n    \"name\": \"atlas\",\n    \"test_suites\": []\n}"
+        ],
         "paygen": false,
         "push_image": false,
         "suite_scheduling": false,
@@ -2235,8 +2239,10 @@
         "boards": [
             "atlas-blueznext"
         ],
-        "chrome_sdk_build_chrome": false,
         "important": false,
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas\",\n    \"name\": \"atlas\",\n    \"test_suites\": []\n}"
+        ],
         "vm_tests": [],
         "vm_tests_override": null
     },
@@ -2245,7 +2251,6 @@
         "boards": [
             "atlas-blueznext"
         ],
-        "chrome_sdk_build_chrome": false,
         "debug": true,
         "display_label": "tryjob",
         "hw_tests": [
@@ -2259,6 +2264,9 @@
         ],
         "hw_tests_override": null,
         "luci_builder": "Try",
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas\",\n    \"name\": \"atlas\",\n    \"test_suites\": []\n}"
+        ],
         "paygen": false,
         "push_image": false,
         "suite_scheduling": false,
@@ -2407,6 +2415,9 @@
         "boards": [
             "atlas"
         ],
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas\",\n    \"name\": \"atlas\",\n    \"test_suites\": []\n}"
+        ],
         "vm_tests": [],
         "vm_tests_override": null
     },
@@ -2414,6 +2425,9 @@
         "_template": "release_basic",
         "boards": [
             "atlas"
+        ],
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas\",\n    \"name\": \"atlas\",\n    \"test_suites\": []\n}"
         ]
     },
     "atlas-release-basic-tryjob": {
@@ -2425,6 +2439,9 @@
         "display_label": "tryjob",
         "hw_tests_override": null,
         "luci_builder": "Try",
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas\",\n    \"name\": \"atlas\",\n    \"test_suites\": []\n}"
+        ],
         "notification_configs": []
     },
     "atlas-release-tryjob": {
@@ -2445,6 +2462,9 @@
         ],
         "hw_tests_override": null,
         "luci_builder": "Try",
+        "models": [
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"atlas\",\n    \"name\": \"atlas\",\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 fa4061b..a931d9c 100644
--- a/config/ge_build_config.json
+++ b/config/ge_build_config.json
@@ -38,42 +38,6 @@
       ]
     },
     {
-      "name": "atlas",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": false,
-          "leader_board": false,
-          "board_group": "",
-          "arch": "X86_INTERNAL"
-        }
-      ]
-    },
-    {
-      "name": "atlas-arm64",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": true,
-          "leader_board": false,
-          "board_group": "poppy",
-          "arch": "X86_INTERNAL"
-        }
-      ]
-    },
-    {
-      "name": "atlas-blueznext",
-      "configs": [
-        {
-          "builder": "RELEASE",
-          "experimental": true,
-          "leader_board": false,
-          "board_group": "poppy",
-          "arch": "X86_INTERNAL"
-        }
-      ]
-    },
-    {
       "name": "auron_paine",
       "configs": [
         {
@@ -1237,6 +1201,57 @@
       ]
     },
     {
+      "name": "atlas",
+      "reference_board_name": "atlas",
+      "arch": "X86_INTERNAL",
+      "builder": "RELEASE",
+      "experimental": false,
+      "models": [
+        {
+          "board_name": "atlas",
+          "name": "atlas",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 356,
+          "is_active": true
+        }
+      ]
+    },
+    {
+      "name": "atlas-arm64",
+      "reference_board_name": "atlas-arm64",
+      "arch": "X86_INTERNAL",
+      "builder": "RELEASE",
+      "experimental": true,
+      "models": [
+        {
+          "board_name": "atlas-arm64",
+          "name": "atlas",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 447,
+          "is_active": true
+        }
+      ]
+    },
+    {
+      "name": "atlas-blueznext",
+      "reference_board_name": "atlas-blueznext",
+      "arch": "X86_INTERNAL",
+      "builder": "RELEASE",
+      "experimental": true,
+      "models": [
+        {
+          "board_name": "atlas-blueznext",
+          "name": "atlas",
+          "cq_test_enabled": false,
+          "release_builder_test_pool": "bvt",
+          "board_id": 439,
+          "is_active": true
+        }
+      ]
+    },
+    {
       "name": "cheza",
       "reference_board_name": "cheza",
       "arch": "ARM_INTERNAL",