diff --git a/app/boards/arm/bdn9/Kconfig.board b/app/boards/arm/bdn9/Kconfig.board
deleted file mode 100644
index 76a204cc4..000000000
--- a/app/boards/arm/bdn9/Kconfig.board
+++ /dev/null
@@ -1,8 +0,0 @@
-# keeb.io BDN9 board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_BDN9
-    bool "BDN9 rev2"
-    depends on SOC_STM32F072XB
diff --git a/app/boards/arm/bdn9/bdn9_rev2.yml b/app/boards/arm/bdn9/bdn9_rev2.yml
deleted file mode 100644
index 01ebd3e0b..000000000
--- a/app/boards/arm/bdn9/bdn9_rev2.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-file_format: "1"
-id: bdn9_rev2
-name: BDN9 Rev2
-type: board
-arch: arm
-features:
-  - keys
-  - encoder
-outputs:
-  - usb
-url: https://keeb.io/products/bdn9-rev-2-3x3-9-key-macropad-rotary-encoder-and-rgb
diff --git a/app/boards/keebio/bdn9/Kconfig.bdn9 b/app/boards/keebio/bdn9/Kconfig.bdn9
new file mode 100644
index 000000000..29055ef57
--- /dev/null
+++ b/app/boards/keebio/bdn9/Kconfig.bdn9
@@ -0,0 +1,5 @@
+# Copyright (c) 2020 Pete Johanson
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_BDN9
+    select SOC_STM32F072XB
diff --git a/app/boards/arm/bdn9/Kconfig.defconfig b/app/boards/keebio/bdn9/Kconfig.defconfig
similarity index 100%
rename from app/boards/arm/bdn9/Kconfig.defconfig
rename to app/boards/keebio/bdn9/Kconfig.defconfig
diff --git a/app/boards/arm/bdn9/README.md b/app/boards/keebio/bdn9/README.md
similarity index 100%
rename from app/boards/arm/bdn9/README.md
rename to app/boards/keebio/bdn9/README.md
diff --git a/app/boards/arm/bdn9/bdn9_rev2-layouts.dtsi b/app/boards/keebio/bdn9/bdn9-layouts.dtsi
similarity index 100%
rename from app/boards/arm/bdn9/bdn9_rev2-layouts.dtsi
rename to app/boards/keebio/bdn9/bdn9-layouts.dtsi
diff --git a/app/boards/arm/bdn9/bdn9_rev2.conf b/app/boards/keebio/bdn9/bdn9.conf
similarity index 100%
rename from app/boards/arm/bdn9/bdn9_rev2.conf
rename to app/boards/keebio/bdn9/bdn9.conf
diff --git a/app/boards/arm/bdn9/bdn9_rev2.dts b/app/boards/keebio/bdn9/bdn9.dts
similarity index 99%
rename from app/boards/arm/bdn9/bdn9_rev2.dts
rename to app/boards/keebio/bdn9/bdn9.dts
index 389d23b7d..542c5341c 100644
--- a/app/boards/arm/bdn9/bdn9_rev2.dts
+++ b/app/boards/keebio/bdn9/bdn9.dts
@@ -11,7 +11,7 @@
 
 #include <dt-bindings/zmk/matrix_transform.h>
 
-#include "bdn9_rev2-layouts.dtsi"
+#include "bdn9-layouts.dtsi"
 
 &physical_layout0 {
     transform = <&matrix_transform0>;
diff --git a/app/boards/arm/bdn9/bdn9_rev2.keymap b/app/boards/keebio/bdn9/bdn9.keymap
similarity index 100%
rename from app/boards/arm/bdn9/bdn9_rev2.keymap
rename to app/boards/keebio/bdn9/bdn9.keymap
diff --git a/app/boards/arm/bdn9/bdn9_rev2.yaml b/app/boards/keebio/bdn9/bdn9.yaml
similarity index 100%
rename from app/boards/arm/bdn9/bdn9_rev2.yaml
rename to app/boards/keebio/bdn9/bdn9.yaml
diff --git a/app/boards/arm/bdn9/bdn9_rev2.zmk.yml b/app/boards/keebio/bdn9/bdn9.zmk.yml
similarity index 72%
rename from app/boards/arm/bdn9/bdn9_rev2.zmk.yml
rename to app/boards/keebio/bdn9/bdn9.zmk.yml
index 4680746f2..4991888c4 100644
--- a/app/boards/arm/bdn9/bdn9_rev2.zmk.yml
+++ b/app/boards/keebio/bdn9/bdn9.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
-id: bdn9_rev2
-name: BDN9 Rev2
+id: bdn9
+name: BDN9 (Rev2)
 type: board
 arch: arm
 outputs:
@@ -9,3 +9,6 @@ features:
   - keys
   - encoder
 url: https://keeb.io/collections/bdn9-collection/products/bdn9-rev-2-3x3-9-key-macropad-rotary-encoder-and-rgb
+revisions:
+  - "2.0.0"
+default_revision: "2.0.0"
diff --git a/app/boards/arm/bdn9/bdn9_rev2_defconfig b/app/boards/keebio/bdn9/bdn9_defconfig
similarity index 85%
rename from app/boards/arm/bdn9/bdn9_rev2_defconfig
rename to app/boards/keebio/bdn9/bdn9_defconfig
index a59fa5221..2aad1628d 100644
--- a/app/boards/arm/bdn9/bdn9_rev2_defconfig
+++ b/app/boards/keebio/bdn9/bdn9_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_STM32F0X=y
-CONFIG_SOC_STM32F072XB=y
 # 72MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
diff --git a/app/boards/arm/bdn9/board.cmake b/app/boards/keebio/bdn9/board.cmake
similarity index 100%
rename from app/boards/arm/bdn9/board.cmake
rename to app/boards/keebio/bdn9/board.cmake
diff --git a/app/boards/keebio/bdn9/board.yml b/app/boards/keebio/bdn9/board.yml
new file mode 100644
index 000000000..45eaad641
--- /dev/null
+++ b/app/boards/keebio/bdn9/board.yml
@@ -0,0 +1,10 @@
+board:
+  name: bdn9
+  vendor: keebio
+  socs:
+    - name: stm32f072xb
+  revision:
+    format: major.minor.patch
+    default: 2.0.0
+    revisions:
+      - name: 2.0.0
diff --git a/app/core-coverage.yml b/app/core-coverage.yml
index ac428d275..51bcedf21 100644
--- a/app/core-coverage.yml
+++ b/app/core-coverage.yml
@@ -9,7 +9,7 @@ shield:
   - settings_reset
   - tidbit
 include:
-  - board: bdn9_rev2
+  - board: bdn9
   - board: nice60
   - board: xiao_ble
     shield: hummingbird