diff --git a/app/boards/arm/s40nc/Kconfig.board b/app/boards/arm/s40nc/Kconfig.board
deleted file mode 100644
index e703d7269..000000000
--- a/app/boards/arm/s40nc/Kconfig.board
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_S40NC
-    bool "S40NC"
-    depends on SOC_NRF52840_QIAA
diff --git a/app/boards/arm/s40nc/Kconfig.defconfig b/app/boards/mechwild/s40nc/Kconfig.defconfig
similarity index 100%
rename from app/boards/arm/s40nc/Kconfig.defconfig
rename to app/boards/mechwild/s40nc/Kconfig.defconfig
diff --git a/app/boards/mechwild/s40nc/Kconfig.s40nc b/app/boards/mechwild/s40nc/Kconfig.s40nc
new file mode 100644
index 000000000..749f8f11d
--- /dev/null
+++ b/app/boards/mechwild/s40nc/Kconfig.s40nc
@@ -0,0 +1,8 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_S40NC
+    select SOC_NRF52840_QIAA
+    imply RETAINED_MEM
+    imply RETENTION
+    imply RETENTION_BOOT_MODE
diff --git a/app/boards/arm/s40nc/README.md b/app/boards/mechwild/s40nc/README.md
similarity index 100%
rename from app/boards/arm/s40nc/README.md
rename to app/boards/mechwild/s40nc/README.md
diff --git a/app/boards/arm/s40nc/board.cmake b/app/boards/mechwild/s40nc/board.cmake
similarity index 100%
rename from app/boards/arm/s40nc/board.cmake
rename to app/boards/mechwild/s40nc/board.cmake
diff --git a/app/boards/mechwild/s40nc/board.yml b/app/boards/mechwild/s40nc/board.yml
new file mode 100644
index 000000000..3df3c330f
--- /dev/null
+++ b/app/boards/mechwild/s40nc/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: s40nc
+  vendor: mechwild
+  socs:
+    - name: nrf52840
diff --git a/app/boards/arm/s40nc/pre_dt_board.cmake b/app/boards/mechwild/s40nc/pre_dt_board.cmake
similarity index 100%
rename from app/boards/arm/s40nc/pre_dt_board.cmake
rename to app/boards/mechwild/s40nc/pre_dt_board.cmake
diff --git a/app/boards/arm/s40nc/s40nc.dts b/app/boards/mechwild/s40nc/s40nc.dts
similarity index 98%
rename from app/boards/arm/s40nc/s40nc.dts
rename to app/boards/mechwild/s40nc/s40nc.dts
index 4c37030db..814a08017 100644
--- a/app/boards/arm/s40nc/s40nc.dts
+++ b/app/boards/mechwild/s40nc/s40nc.dts
@@ -6,6 +6,8 @@
 
 /dts-v1/;
 #include <nordic/nrf52840_qiaa.dtsi>
+#include <common/nordic/nrf52840_uf2_boot_mode.dtsi>
+
 #include <dt-bindings/zmk/matrix_transform.h>
 
 / {
diff --git a/app/boards/arm/s40nc/s40nc.keymap b/app/boards/mechwild/s40nc/s40nc.keymap
similarity index 100%
rename from app/boards/arm/s40nc/s40nc.keymap
rename to app/boards/mechwild/s40nc/s40nc.keymap
diff --git a/app/boards/arm/s40nc/s40nc.yaml b/app/boards/mechwild/s40nc/s40nc.yaml
similarity index 100%
rename from app/boards/arm/s40nc/s40nc.yaml
rename to app/boards/mechwild/s40nc/s40nc.yaml
diff --git a/app/boards/arm/s40nc/s40nc.zmk.yml b/app/boards/mechwild/s40nc/s40nc.zmk.yml
similarity index 100%
rename from app/boards/arm/s40nc/s40nc.zmk.yml
rename to app/boards/mechwild/s40nc/s40nc.zmk.yml
diff --git a/app/boards/arm/s40nc/s40nc_defconfig b/app/boards/mechwild/s40nc/s40nc_defconfig
similarity index 78%
rename from app/boards/arm/s40nc/s40nc_defconfig
rename to app/boards/mechwild/s40nc/s40nc_defconfig
index b523ceb80..79d4175f7 100644
--- a/app/boards/arm/s40nc/s40nc_defconfig
+++ b/app/boards/mechwild/s40nc/s40nc_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_S40NC=y
-
 # Enable MPU
 CONFIG_ARM_MPU=y