diff --git a/build.yaml b/build.yaml
index a14a5c860..626e66a8d 100644
--- a/build.yaml
+++ b/build.yaml
@@ -16,3 +16,5 @@ include:
   - board: planck_rev6
   - board: corneish_zen_v2_left
   - board: corneish_zen_v2_right
+  - board: glove80_lh
+  - board: glove80_rh
diff --git a/config/glove80.conf b/config/glove80.conf
new file mode 100644
index 000000000..ed5ea7666
--- /dev/null
+++ b/config/glove80.conf
@@ -0,0 +1,15 @@
+# Set sleep timeout to 30min (30*60*1000ms)
+CONFIG_ZMK_SLEEP=y
+CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
+
+# Combo config, automated by build script
+CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6
+CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3
+
+# Bluetooth tweaks
+CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y
+CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n
+CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
+CONFIG_BT_MAX_CONN=3
+CONFIG_BT_MAX_PAIRED=3
+
diff --git a/config/glove80.keymap b/config/glove80.keymap
new file mode 100644
index 000000000..2c103bcf5
--- /dev/null
+++ b/config/glove80.keymap
@@ -0,0 +1,27 @@
+/* source keypos definitions */
+#include "../zmk-nodefree-config/keypos_def/keypos_glv80.h"
+
+/* map the Glove's extra keys */
+#define X_LT  \
+                &kp F1    &kp F2 &kp F3 &kp F4 &kp F5                 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 \
+                &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5   &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS \
+                &kp TAB
+#define X_RT    &kp BACKSLASH
+
+#define X_LM    &kp ESC
+#define X_RM    &none
+
+#define X_LB    &none
+#define X_MB    &none &none &none       &none &none &none
+#define X_RB    &none
+
+#define X_LH    &none &none &none &kp LEFT &kp RIGHT
+#define X_MH    &none &none
+#define X_RH    &kp UP &kp DOWN &none &none &none
+
+/* activate bluetooth */
+#define CONFIG_WIRELESS 1
+
+/* source the main keymap */
+#include "base.keymap"
+
diff --git a/zmk-nodefree-config b/zmk-nodefree-config
index 8506dbaae..49f52bf17 160000
--- a/zmk-nodefree-config
+++ b/zmk-nodefree-config
@@ -1 +1 @@
-Subproject commit 8506dbaaee9b46d200aa553a94b6dbca8560a5e1
+Subproject commit 49f52bf174820a71ca780b34daa6bd0a1ffb5a2c