diff --git a/config/config_dump.json b/config/config_dump.json
index 15f9484..d8e3080 100644
--- a/config/config_dump.json
+++ b/config/config_dump.json
@@ -11362,7 +11362,7 @@
         "hw_tests_override": [],
         "important": false,
         "models": [
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"eve-userdebug\",\n    \"name\": \"eve\",\n    \"test_suites\": []\n}"
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"eve\",\n    \"name\": \"eve\",\n    \"test_suites\": []\n}"
         ],
         "vm_tests": [],
         "vm_tests_override": null
@@ -11379,7 +11379,7 @@
         "hw_tests_override": null,
         "luci_builder": "Try",
         "models": [
-            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"eve-userdebug\",\n    \"name\": \"eve\",\n    \"test_suites\": []\n}"
+            "{\n    \"enable_skylab\": true,\n    \"lab_board_name\": \"eve\",\n    \"name\": \"eve\",\n    \"test_suites\": []\n}"
         ],
         "paygen": false,
         "push_image": false,
diff --git a/lib/config_lib.py b/lib/config_lib.py
index e120640..dfb4de1 100644
--- a/lib/config_lib.py
+++ b/lib/config_lib.py
@@ -1878,6 +1878,7 @@
       '-kernelnext', #
       '-kvm', #
       '-ndktranslation', #
+      '-userdebug', #
   ]
   # ARM64 userspace boards use 64 suffix but can't put that in list above
   # because of collisions with boards like kevin-arc64.