diff --git a/app/boards/lowprokb/corneish_zen/board.yml b/app/boards/lowprokb/corneish_zen/board.yml
index 97d63ec68..aafdcbd6c 100644
--- a/app/boards/lowprokb/corneish_zen/board.yml
+++ b/app/boards/lowprokb/corneish_zen/board.yml
@@ -3,6 +3,8 @@ boards:
     vendor: lowprokb
     socs:
       - name: nrf52840
+        variants:
+          - name: zmk
     revision:
       format: major.minor.patch
       default: 2.0.0
@@ -14,6 +16,8 @@ boards:
     vendor: lowprokb
     socs:
       - name: nrf52840
+        variants:
+          - name: zmk
     revision:
       format: major.minor.patch
       default: 2.0.0
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen.zmk.yml b/app/boards/lowprokb/corneish_zen/corneish_zen.zmk.yml
index 9630386de..574664a25 100644
--- a/app/boards/lowprokb/corneish_zen/corneish_zen.zmk.yml
+++ b/app/boards/lowprokb/corneish_zen/corneish_zen.zmk.yml
@@ -15,5 +15,5 @@ revisions:
   - 2.0.0
   - 1.0.0
 siblings:
-  - corneish_zen_left
-  - corneish_zen_right
+  - corneish_zen_left//zmk
+  - corneish_zen_right//zmk
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_left.dts b/app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk.dts
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_left.dts
rename to app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk.dts
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_left_1_0_0.overlay b/app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_1_0_0.overlay
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_left_1_0_0.overlay
rename to app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_1_0_0.overlay
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_left_1_0_0_defconfig b/app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_1_0_0_defconfig
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_left_1_0_0_defconfig
rename to app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_1_0_0_defconfig
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_left_2_0_0.overlay b/app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_2_0_0.overlay
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_left_2_0_0.overlay
rename to app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_2_0_0.overlay
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_left_2_0_0_defconfig b/app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_2_0_0_defconfig
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_left_2_0_0_defconfig
rename to app/boards/lowprokb/corneish_zen/corneish_zen_left_nrf52840_zmk_2_0_0_defconfig
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_right.dts b/app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk.dts
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_right.dts
rename to app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk.dts
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_right_1_0_0.overlay b/app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_1_0_0.overlay
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_right_1_0_0.overlay
rename to app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_1_0_0.overlay
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_right_1_0_0_defconfig b/app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_1_0_0_defconfig
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_right_1_0_0_defconfig
rename to app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_1_0_0_defconfig
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_right_2_0_0.overlay b/app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_2_0_0.overlay
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_right_2_0_0.overlay
rename to app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_2_0_0.overlay
diff --git a/app/boards/lowprokb/corneish_zen/corneish_zen_right_2_0_0_defconfig b/app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_2_0_0_defconfig
similarity index 100%
rename from app/boards/lowprokb/corneish_zen/corneish_zen_right_2_0_0_defconfig
rename to app/boards/lowprokb/corneish_zen/corneish_zen_right_nrf52840_zmk_2_0_0_defconfig