diff --git a/app/boards/arm/adafruit_feather_nrf52840/CMakeLists.txt b/app/boards/arm/adafruit_feather_nrf52840/CMakeLists.txt
index e69de29b..42d4786d 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/CMakeLists.txt
+++ b/app/boards/arm/adafruit_feather_nrf52840/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
+COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
+-c 
+-b 0x26000
+-f 0xADA52840
+-o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
+${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
+)
\ No newline at end of file
diff --git a/app/boards/arm/adafruit_feather_nrf52840/Kconfig b/app/boards/arm/adafruit_feather_nrf52840/Kconfig
index 3328e345..7367f2b9 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/Kconfig
+++ b/app/boards/arm/adafruit_feather_nrf52840/Kconfig
@@ -1,7 +1,7 @@
 # Adafruit Feather nRF52840 Express board configuration
 
-# Copyright (c) 2020 Tobias Svehagen
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 config BOARD_ENABLE_DCDC
 	bool "Enable DCDC mode"
diff --git a/app/boards/arm/adafruit_feather_nrf52840/Kconfig.board b/app/boards/arm/adafruit_feather_nrf52840/Kconfig.board
index 4e37d053..5649de91 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/Kconfig.board
+++ b/app/boards/arm/adafruit_feather_nrf52840/Kconfig.board
@@ -1,7 +1,7 @@
 # Adafruit Feather nRF52840 Express board configuration
 
-# Copyright (c) 2020 Tobias Svehagen
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 config BOARD_ADAFRUIT_FEATHER_NRF52840
 	bool "Adafruit Feather nRF52840 Express"
diff --git a/app/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig b/app/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig
index b7e86319..34ef74f1 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig
+++ b/app/boards/arm/adafruit_feather_nrf52840/Kconfig.defconfig
@@ -1,7 +1,7 @@
 # Adafruit Feather nRF52840 Express board configuration
 
-# Copyright (c) 2020 Tobias Svehagen
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 if BOARD_ADAFRUIT_FEATHER_NRF52840
 
diff --git a/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts b/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts
index 129918cf..b875749d 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts
+++ b/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020 Tobias Svehagen
- *
- * SPDX-License-Identifier: Apache-2.0
+* Copyright (c) 2021 The ZMK Contributors
+*
+* SPDX-License-Identifier: MIT
  */
 
  /dts-v1/;
diff --git a/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.zmk.yml b/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.zmk.yml
index e69de29b..73a35902 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.zmk.yml
+++ b/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.zmk.yml
@@ -0,0 +1,8 @@
+identifier: adafruit_feather_nrf52840
+name: Adafruit Feather nRF52840 Express
+type: mcu
+arch: arm
+outputs:
+  - usb
+  - ble
+url: https://www.adafruit.com/product/4062
\ No newline at end of file
diff --git a/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig b/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig
index 241b13d5..bdc942b8 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig
+++ b/app/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840_defconfig
@@ -1,4 +1,5 @@
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52840_QIAA=y
diff --git a/app/boards/arm/adafruit_feather_nrf52840/board.cmake b/app/boards/arm/adafruit_feather_nrf52840/board.cmake
index bd901bdf..3d64fafd 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/board.cmake
+++ b/app/boards/arm/adafruit_feather_nrf52840/board.cmake
@@ -1,4 +1,5 @@
-# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
 
 # board_runner_args(jlink "--device=nrf52" "--speed=4000")
 # board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
diff --git a/app/boards/arm/adafruit_feather_nrf52840/feather_connector.dtsi b/app/boards/arm/adafruit_feather_nrf52840/feather_connector.dtsi
index cbf0c139..24cc0a12 100644
--- a/app/boards/arm/adafruit_feather_nrf52840/feather_connector.dtsi
+++ b/app/boards/arm/adafruit_feather_nrf52840/feather_connector.dtsi
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020 Richard Osterloh <richard.osterloh@gmail.com>
- *
- * SPDX-License-Identifier: Apache-2.0
+* Copyright (c) 2021 The ZMK Contributors
+*
+* SPDX-License-Identifier: MIT
  */
 
 / {