diff --git a/app/boards/arm/planck/CMakeLists.txt b/app/boards/olkb/planck/CMakeLists.txt
similarity index 100%
rename from app/boards/arm/planck/CMakeLists.txt
rename to app/boards/olkb/planck/CMakeLists.txt
diff --git a/app/boards/arm/planck/Kconfig.defconfig b/app/boards/olkb/planck/Kconfig.defconfig
similarity index 100%
rename from app/boards/arm/planck/Kconfig.defconfig
rename to app/boards/olkb/planck/Kconfig.defconfig
diff --git a/app/boards/arm/planck/Kconfig.board b/app/boards/olkb/planck/Kconfig.planck
similarity index 55%
rename from app/boards/arm/planck/Kconfig.board
rename to app/boards/olkb/planck/Kconfig.planck
index 28b7381fb..f8d42f068 100644
--- a/app/boards/arm/planck/Kconfig.board
+++ b/app/boards/olkb/planck/Kconfig.planck
@@ -3,6 +3,6 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-config BOARD_PLANCK_REV6
-    bool "Planck V6 Keyboard"
-    depends on SOC_STM32F303XC
+config BOARD_PLANCK
+    bool "Planck Keyboard"
+    select SOC_STM32F303XC
diff --git a/app/boards/arm/planck/board.cmake b/app/boards/olkb/planck/board.cmake
similarity index 100%
rename from app/boards/arm/planck/board.cmake
rename to app/boards/olkb/planck/board.cmake
diff --git a/app/boards/olkb/planck/board.yml b/app/boards/olkb/planck/board.yml
new file mode 100644
index 000000000..b81bcddbf
--- /dev/null
+++ b/app/boards/olkb/planck/board.yml
@@ -0,0 +1,10 @@
+board:
+  name: planck
+  vendor: olkb
+  socs:
+    - name: stm32f303xc
+  revision:
+    format: major.minor.patch
+    default: 6.0.0
+    revisions:
+      - name: 6.0.0
diff --git a/app/boards/arm/planck/planck_rev6.dts b/app/boards/olkb/planck/planck.dts
similarity index 100%
rename from app/boards/arm/planck/planck_rev6.dts
rename to app/boards/olkb/planck/planck.dts
diff --git a/app/boards/arm/planck/planck_rev6.keymap b/app/boards/olkb/planck/planck.keymap
similarity index 100%
rename from app/boards/arm/planck/planck_rev6.keymap
rename to app/boards/olkb/planck/planck.keymap
diff --git a/app/boards/arm/planck/planck_rev6.yaml b/app/boards/olkb/planck/planck.yaml
similarity index 100%
rename from app/boards/arm/planck/planck_rev6.yaml
rename to app/boards/olkb/planck/planck.yaml
diff --git a/app/boards/arm/planck/planck_rev6.zmk.yml b/app/boards/olkb/planck/planck.zmk.yml
similarity index 61%
rename from app/boards/arm/planck/planck_rev6.zmk.yml
rename to app/boards/olkb/planck/planck.zmk.yml
index f9d424247..42e83d12f 100644
--- a/app/boards/arm/planck/planck_rev6.zmk.yml
+++ b/app/boards/olkb/planck/planck.zmk.yml
@@ -1,6 +1,6 @@
 file_format: "1"
-id: planck_rev6
-name: Planck Rev6
+id: planck
+name: Planck (Rev6)
 type: board
 arch: arm
 features:
@@ -9,3 +9,6 @@ features:
 outputs:
   - usb
 url: https://olkb.com/collections/planck
+revisions:
+  - "6.0.0"
+default_revision: "6.0.0"
diff --git a/app/boards/arm/planck/planck_rev6_defconfig b/app/boards/olkb/planck/planck_6_0_0_defconfig
similarity index 85%
rename from app/boards/arm/planck/planck_rev6_defconfig
rename to app/boards/olkb/planck/planck_6_0_0_defconfig
index f45306390..154e7687b 100644
--- a/app/boards/arm/planck/planck_rev6_defconfig
+++ b/app/boards/olkb/planck/planck_6_0_0_defconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-CONFIG_SOC_SERIES_STM32F3X=y
-CONFIG_SOC_STM32F303XC=y
 # 72MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000