diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index 1e8b8d9..bda86aa 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+ifeq (,$(filter %comet23,$(PRODUCT_NAME)))
+
 TARGET_BOARD_INFO_FILE := device/google/comet/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := comet
 TARGET_SCREEN_DENSITY := 420
@@ -23,3 +25,9 @@ include device/google/zumapro/BoardConfig-common.mk
 -include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
 include device/google/comet-sepolicy/comet-sepolicy.mk
 include device/google/comet/wifi/BoardConfig-wifi.mk
+
+else
+
+include device/google/comet23/comet23/BoardConfig.mk
+
+endif