diff --git a/build.yaml b/build.yaml
index ad5fab6..a14a5c8 100644
--- a/build.yaml
+++ b/build.yaml
@@ -14,3 +14,5 @@
 ---
 include:
   - board: planck_rev6
+  - board: corneish_zen_v2_left
+  - board: corneish_zen_v2_right
diff --git a/config/corneish_zen_v2.conf b/config/corneish_zen_v2.conf
new file mode 100644
index 0000000..eaebe9a
--- /dev/null
+++ b/config/corneish_zen_v2.conf
@@ -0,0 +1,22 @@
+CONFIG_ZMK_KEYBOARD_NAME="Cornish Zen v2"
+
+# go to sleep after two hours (2*60*60*1000ms)
+CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=7200000
+
+# enable this to build settings reset firmware
+# CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y
+
+# Turn on logging, and set ZMK logging to debug output
+# CONFIG_ZMK_USB_LOGGING=y
+
+# disable layer status, it's too slow to be usable
+CONFIG_ZMK_WIDGET_LAYER_STATUS=n
+CONFIG_CUSTOM_WIDGET_LAYER_STATUS=n
+
+# Mouse config, requires PR #778
+# CONFIG_ZMK_MOUSE=y
+# CONFIG_ZMK_MOUSE_TICK_DURATION=8
+
+# Combo config, automated by build script
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=4
+CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
diff --git a/config/corneish_zen_v2.keymap b/config/corneish_zen_v2.keymap
new file mode 100644
index 0000000..d308946
--- /dev/null
+++ b/config/corneish_zen_v2.keymap
@@ -0,0 +1,12 @@
+/* source keypos definitions */
+#include "../zmk-nodefree-config/keypos_def/keypos_36keys.h"
+
+/* map Zen's extra keys */
+#define XTR_MH  &kp BSPC  &kp RET  // thumb row, middle
+
+/* bluetooth support */
+#include <dt-bindings/zmk/bt.h>
+
+/* source the main keymap */
+#include "base.keymap"
+
diff --git a/scripts/zmk_build.sh b/scripts/zmk_build.sh
index bdb4049..2c879bf 100755
--- a/scripts/zmk_build.sh
+++ b/scripts/zmk_build.sh
@@ -6,7 +6,7 @@
 
 ZMK_DIR="$HOME/zmk"
 CONFIG_DIR="$HOME/zmk-config"
-OUTPUT="$WINHOME/Downloads/planck_rev6-zmk.bin"
+OUTPUT_DIR="$WINHOME/Downloads"
 
 # +-------------------------+
 # | AUTOMATE CONFIG OPTIONS |
@@ -40,16 +40,28 @@ echo "Setting MAX_KEYS_PER_COMBO to $count"
 
 cd "$ZMK_DIR/app"
 
-# build the firmware
-west build -b planck_rev6 -- -DZMK_CONFIG="$CONFIG_DIR/config"
-
-# copy firmware to Downloads if build was succesful
+# build the firmware and copy to Downloads if build was successful
+west build -d build/planck -b planck_rev6 -- -DZMK_CONFIG="$CONFIG_DIR/config"
 if [[ $? -eq 0 ]]
 then
+    OUTPUT="$OUTPUT_DIR/planck_rev6-zmk.bin"
     [[ -f $OUTPUT ]] && [[ ! -L $OUTPUT ]] && mv "$OUTPUT" "$OUTPUT".bak
-    cp "$ZMK_DIR/app/build/zephyr/zmk.bin" "$OUTPUT"
-    exit 0
-else
-    exit 1
+    cp "$ZMK_DIR/app/build/planck/zephyr/zmk.bin" "$OUTPUT"
+fi
+
+west build -d build/zen_left -b corneish_zen_v2_left -- -DZMK_CONFIG="$CONFIG_DIR/config"
+if [[ $? -eq 0 ]]
+then
+    OUTPUT="$OUTPUT_DIR/zen_v2_left-zmk.uf2"
+    [[ -f $OUTPUT ]] && [[ ! -L $OUTPUT ]] && mv "$OUTPUT" "$OUTPUT".bak
+    cp "$ZMK_DIR/app/build/zen_left/zephyr/zmk.uf2" "$OUTPUT"
+fi
+
+west build -d build/zen_right -b corneish_zen_v2_right -- -DZMK_CONFIG="$CONFIG_DIR/config"
+if [[ $? -eq 0 ]]
+then
+    OUTPUT="$OUTPUT_DIR/zen_v2_right-zmk.uf2"
+    [[ -f $OUTPUT ]] && [[ ! -L $OUTPUT ]] && mv "$OUTPUT" "$OUTPUT".bak
+    cp "$ZMK_DIR/app/build/zen_right/zephyr/zmk.uf2" "$OUTPUT"
 fi