diff --git a/app/boards/arm/glove80/Kconfig b/app/boards/arm/glove80/Kconfig
deleted file mode 100644
index f1c12e7e3..000000000
--- a/app/boards/arm/glove80/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_ENABLE_DCDC
-    bool "Enable DCDC mode"
-    select SOC_DCDC_NRF52X
-    default y
-    depends on (BOARD_GLOVE80_LH || BOARD_GLOVE80_RH)
diff --git a/app/boards/arm/glove80/Kconfig.board b/app/boards/arm/glove80/Kconfig.board
deleted file mode 100644
index f68910371..000000000
--- a/app/boards/arm/glove80/Kconfig.board
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_GLOVE80_LH
-    bool "Glove80 LH"
-    depends on SOC_NRF52840_QIAA
-
-config BOARD_GLOVE80_RH
-    bool "Glove80 RH"
-    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/glove80/CMakeLists.txt b/app/boards/moergo/glove80/CMakeLists.txt
similarity index 100%
rename from app/boards/arm/glove80/CMakeLists.txt
rename to app/boards/moergo/glove80/CMakeLists.txt
diff --git a/app/boards/arm/glove80/Kconfig.defconfig b/app/boards/moergo/glove80/Kconfig.defconfig
similarity index 100%
rename from app/boards/arm/glove80/Kconfig.defconfig
rename to app/boards/moergo/glove80/Kconfig.defconfig
diff --git a/app/boards/moergo/glove80/Kconfig.glove80_lh b/app/boards/moergo/glove80/Kconfig.glove80_lh
new file mode 100644
index 000000000..97590cd72
--- /dev/null
+++ b/app/boards/moergo/glove80/Kconfig.glove80_lh
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_GLOVE80_LH
+    select SOC_NRF52840_QIAA
+    imply RETAINED_MEM
+    imply RETENTION
+    imply RETENTION_BOOT_MODE
diff --git a/app/boards/moergo/glove80/Kconfig.glove80_rh b/app/boards/moergo/glove80/Kconfig.glove80_rh
new file mode 100644
index 000000000..07450baa5
--- /dev/null
+++ b/app/boards/moergo/glove80/Kconfig.glove80_rh
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_GLOVE80_RH
+    select SOC_NRF52840_QIAA
+    imply RETAINED_MEM
+    imply RETENTION
+    imply RETENTION_BOOT_MODE
diff --git a/app/boards/arm/glove80/board.cmake b/app/boards/moergo/glove80/board.cmake
similarity index 100%
rename from app/boards/arm/glove80/board.cmake
rename to app/boards/moergo/glove80/board.cmake
diff --git a/app/boards/moergo/glove80/board.yml b/app/boards/moergo/glove80/board.yml
new file mode 100644
index 000000000..fcbd7cf57
--- /dev/null
+++ b/app/boards/moergo/glove80/board.yml
@@ -0,0 +1,9 @@
+boards:
+  - name: glove80_rh
+    vendor: moergo
+    socs:
+      - name: nrf52840
+  - name: glove80_lh
+    vendor: moergo
+    socs:
+      - name: nrf52840
diff --git a/app/boards/arm/glove80/glove80-layouts.dtsi b/app/boards/moergo/glove80/glove80-layouts.dtsi
similarity index 100%
rename from app/boards/arm/glove80/glove80-layouts.dtsi
rename to app/boards/moergo/glove80/glove80-layouts.dtsi
diff --git a/app/boards/arm/glove80/glove80.dtsi b/app/boards/moergo/glove80/glove80.dtsi
similarity index 96%
rename from app/boards/arm/glove80/glove80.dtsi
rename to app/boards/moergo/glove80/glove80.dtsi
index ae7601632..cf3ce7cc6 100644
--- a/app/boards/arm/glove80/glove80.dtsi
+++ b/app/boards/moergo/glove80/glove80.dtsi
@@ -5,6 +5,7 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
 
 #include <dt-bindings/zmk/matrix_transform.h>
 #include "glove80-layouts.dtsi"
@@ -47,6 +48,10 @@
     };
 };
 
+&reg1 {
+    regulator-initial-mode = <NRF5X_REG_MODE_DCDC>;
+};
+
 &adc {
     status = "okay";
 };
diff --git a/app/boards/arm/glove80/glove80.keymap b/app/boards/moergo/glove80/glove80.keymap
similarity index 100%
rename from app/boards/arm/glove80/glove80.keymap
rename to app/boards/moergo/glove80/glove80.keymap
diff --git a/app/boards/arm/glove80/glove80.yaml b/app/boards/moergo/glove80/glove80.yaml
similarity index 100%
rename from app/boards/arm/glove80/glove80.yaml
rename to app/boards/moergo/glove80/glove80.yaml
diff --git a/app/boards/arm/glove80/glove80.zmk.yml b/app/boards/moergo/glove80/glove80.zmk.yml
similarity index 100%
rename from app/boards/arm/glove80/glove80.zmk.yml
rename to app/boards/moergo/glove80/glove80.zmk.yml
diff --git a/app/boards/arm/glove80/glove80_lh-pinctrl.dtsi b/app/boards/moergo/glove80/glove80_lh-pinctrl.dtsi
similarity index 100%
rename from app/boards/arm/glove80/glove80_lh-pinctrl.dtsi
rename to app/boards/moergo/glove80/glove80_lh-pinctrl.dtsi
diff --git a/app/boards/arm/glove80/glove80_lh.dts b/app/boards/moergo/glove80/glove80_lh.dts
similarity index 100%
rename from app/boards/arm/glove80/glove80_lh.dts
rename to app/boards/moergo/glove80/glove80_lh.dts
diff --git a/app/boards/arm/glove80/glove80_lh.keymap b/app/boards/moergo/glove80/glove80_lh.keymap
similarity index 100%
rename from app/boards/arm/glove80/glove80_lh.keymap
rename to app/boards/moergo/glove80/glove80_lh.keymap
diff --git a/app/boards/arm/glove80/glove80_lh_defconfig b/app/boards/moergo/glove80/glove80_lh_defconfig
similarity index 96%
rename from app/boards/arm/glove80/glove80_lh_defconfig
rename to app/boards/moergo/glove80/glove80_lh_defconfig
index a93f27cd8..9973e953e 100644
--- a/app/boards/arm/glove80/glove80_lh_defconfig
+++ b/app/boards/moergo/glove80/glove80_lh_defconfig
@@ -1,10 +1,6 @@
 # Copyright (c) 2021 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_GLOVE80_LH=y
-
 # Enable both USB and BLE
 CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y
diff --git a/app/boards/arm/glove80/glove80_rh-pinctrl.dtsi b/app/boards/moergo/glove80/glove80_rh-pinctrl.dtsi
similarity index 100%
rename from app/boards/arm/glove80/glove80_rh-pinctrl.dtsi
rename to app/boards/moergo/glove80/glove80_rh-pinctrl.dtsi
diff --git a/app/boards/arm/glove80/glove80_rh.dts b/app/boards/moergo/glove80/glove80_rh.dts
similarity index 100%
rename from app/boards/arm/glove80/glove80_rh.dts
rename to app/boards/moergo/glove80/glove80_rh.dts
diff --git a/app/boards/arm/glove80/glove80_rh.keymap b/app/boards/moergo/glove80/glove80_rh.keymap
similarity index 100%
rename from app/boards/arm/glove80/glove80_rh.keymap
rename to app/boards/moergo/glove80/glove80_rh.keymap
diff --git a/app/boards/arm/glove80/glove80_rh_defconfig b/app/boards/moergo/glove80/glove80_rh_defconfig
similarity index 96%
rename from app/boards/arm/glove80/glove80_rh_defconfig
rename to app/boards/moergo/glove80/glove80_rh_defconfig
index ef29d682a..d45e0ded8 100644
--- a/app/boards/arm/glove80/glove80_rh_defconfig
+++ b/app/boards/moergo/glove80/glove80_rh_defconfig
@@ -1,10 +1,6 @@
 # Copyright (c) 2021 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_NRF52X=y
-CONFIG_SOC_NRF52840_QIAA=y
-CONFIG_BOARD_GLOVE80_RH=y
-
 # Enable both USB and BLE
 CONFIG_ZMK_USB=y
 CONFIG_ZMK_BLE=y
diff --git a/app/boards/arm/glove80/pre_dt_board.cmake b/app/boards/moergo/glove80/pre_dt_board.cmake
similarity index 100%
rename from app/boards/arm/glove80/pre_dt_board.cmake
rename to app/boards/moergo/glove80/pre_dt_board.cmake
diff --git a/app/boards/arm/glove80/readme.md b/app/boards/moergo/glove80/readme.md
similarity index 100%
rename from app/boards/arm/glove80/readme.md
rename to app/boards/moergo/glove80/readme.md
diff --git a/app/boards/arm/glove80/usb_serial_number.c b/app/boards/moergo/glove80/usb_serial_number.c
similarity index 100%
rename from app/boards/arm/glove80/usb_serial_number.c
rename to app/boards/moergo/glove80/usb_serial_number.c