diff --git a/app/cmake/zmk_config.cmake b/app/cmake/zmk_config.cmake
index dec31104..c8aa1a00 100644
--- a/app/cmake/zmk_config.cmake
+++ b/app/cmake/zmk_config.cmake
@@ -105,8 +105,10 @@ if (ZMK_CONFIG)
 		endif()
 
 		# TODO: Board revisions?
+		list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.overlay")
 		list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD}.overlay")
 		list(APPEND overlay_candidates "${ZMK_CONFIG}/default.overlay")
+		list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.conf")
 		list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD}.conf")
 		list(APPEND config_candidates "${ZMK_CONFIG}/default.conf")