diff --git a/app/boards/arm/ferris/Kconfig.board b/app/boards/arm/ferris/Kconfig.board
deleted file mode 100644
index 70ee895d8..000000000
--- a/app/boards/arm/ferris/Kconfig.board
+++ /dev/null
@@ -1,8 +0,0 @@
-# Ferris board configuration
-
-# Copyright (c) 2020 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config BOARD_FERRIS
-    bool "Ferris rev 0.2"
-    depends on SOC_STM32F072XB
diff --git a/app/boards/arm/ferris/Kconfig.defconfig b/app/boards/pierrechevalier83/ferris/Kconfig.defconfig
similarity index 85%
rename from app/boards/arm/ferris/Kconfig.defconfig
rename to app/boards/pierrechevalier83/ferris/Kconfig.defconfig
index 420ea01fa..1c8ed02c2 100644
--- a/app/boards/arm/ferris/Kconfig.defconfig
+++ b/app/boards/pierrechevalier83/ferris/Kconfig.defconfig
@@ -5,9 +5,6 @@
 
 if BOARD_FERRIS
 
-config BOARD
-    default "ferris_rev02"
-
 config ZMK_KEYBOARD_NAME
     default "Ferris rev 0.2"
 
diff --git a/app/boards/pierrechevalier83/ferris/Kconfig.ferris b/app/boards/pierrechevalier83/ferris/Kconfig.ferris
new file mode 100644
index 000000000..66f0aa237
--- /dev/null
+++ b/app/boards/pierrechevalier83/ferris/Kconfig.ferris
@@ -0,0 +1,13 @@
+# Ferris board configuration
+
+# Copyright (c) 2020 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config BOARD_FERRIS
+    select SOC_STM32F072XB
+    imply RETAINED_MEM
+    imply RETENTION
+    imply RETENTION_BOOT_MODE
+    imply STM32_BOOTLOADER
+    imply RTC
+    imply BBRAM
diff --git a/app/boards/arm/ferris/README.md b/app/boards/pierrechevalier83/ferris/README.md
similarity index 79%
rename from app/boards/arm/ferris/README.md
rename to app/boards/pierrechevalier83/ferris/README.md
index b6fdcdf26..3dbfb1ba4 100644
--- a/app/boards/arm/ferris/README.md
+++ b/app/boards/pierrechevalier83/ferris/README.md
@@ -3,7 +3,7 @@
 ## Standard Build
 
 ```
-west build -p -d build/ferris --board ferris_rev02
+west build -p -d build/ferris --board ferris
 ```
 
 ## Flashing
diff --git a/app/boards/arm/ferris/board.cmake b/app/boards/pierrechevalier83/ferris/board.cmake
similarity index 100%
rename from app/boards/arm/ferris/board.cmake
rename to app/boards/pierrechevalier83/ferris/board.cmake
diff --git a/app/boards/pierrechevalier83/ferris/board.yml b/app/boards/pierrechevalier83/ferris/board.yml
new file mode 100644
index 000000000..3bed9d0b4
--- /dev/null
+++ b/app/boards/pierrechevalier83/ferris/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: ferris
+  vendor: pierrechevalier83
+  socs:
+    - name: stm32f072xb
diff --git a/app/boards/arm/ferris/ferris_rev02.dts b/app/boards/pierrechevalier83/ferris/ferris.dts
similarity index 85%
rename from app/boards/arm/ferris/ferris_rev02.dts
rename to app/boards/pierrechevalier83/ferris/ferris.dts
index 1ec9a8043..c49ae602a 100644
--- a/app/boards/arm/ferris/ferris_rev02.dts
+++ b/app/boards/pierrechevalier83/ferris/ferris.dts
@@ -106,7 +106,7 @@
     clock-frequency = <I2C_BITRATE_FAST>;
 
     right_io: mcp23017@20 {
-        compatible = "microchip,mcp230xx";
+        compatible = "microchip,mcp23017";
         status = "okay";
         gpio-controller;
         reg = <0x20>;
@@ -147,9 +147,37 @@ zephyr_udc0: &usb {
     apb1-prescaler = <1>;
 };
 
-
 &rtc {
+    clocks = <&rcc STM32_CLOCK_BUS_APB1 0x10000000>,
+         <&rcc STM32_SRC_LSI RTC_SEL(2)>;
     status = "okay";
+
+    backup_regs {
+        status = "okay";
+    };
+};
+
+&bbram {
+    status = "okay";
+
+    retainedmem0: retainedmem {
+        compatible = "zephyr,retained-bbram";
+        status = "okay";
+                #address-cells = <1>;
+                #size-cells = <1>;
+
+                retention0: retention@0 {
+                        compatible = "zephyr,retention";
+                        status = "okay";
+                        reg = <0x0 0x1>;
+                };
+    };
+};
+
+/ {
+        chosen {
+                zephyr,boot-mode = &retention0;
+        };
 };
 
 &flash0 {
diff --git a/app/boards/arm/ferris/ferris_rev02.keymap b/app/boards/pierrechevalier83/ferris/ferris.keymap
similarity index 100%
rename from app/boards/arm/ferris/ferris_rev02.keymap
rename to app/boards/pierrechevalier83/ferris/ferris.keymap
diff --git a/app/boards/arm/ferris/ferris_rev02.yaml b/app/boards/pierrechevalier83/ferris/ferris.yaml
similarity index 83%
rename from app/boards/arm/ferris/ferris_rev02.yaml
rename to app/boards/pierrechevalier83/ferris/ferris.yaml
index f4cbdcaf7..d2dbfa0a3 100644
--- a/app/boards/arm/ferris/ferris_rev02.yaml
+++ b/app/boards/pierrechevalier83/ferris/ferris.yaml
@@ -1,4 +1,4 @@
-identifier: ferris_rev02
+identifier: ferris
 name: Ferris 0.2
 type: mcu
 arch: arm
diff --git a/app/boards/arm/ferris/ferris_rev02.zmk.yml b/app/boards/pierrechevalier83/ferris/ferris.zmk.yml
similarity index 90%
rename from app/boards/arm/ferris/ferris_rev02.zmk.yml
rename to app/boards/pierrechevalier83/ferris/ferris.zmk.yml
index da3a7f534..841f437a4 100644
--- a/app/boards/arm/ferris/ferris_rev02.zmk.yml
+++ b/app/boards/pierrechevalier83/ferris/ferris.zmk.yml
@@ -1,5 +1,5 @@
 file_format: "1"
-id: ferris_rev02
+id: ferris
 name: Ferris 0.2
 type: board
 arch: arm
diff --git a/app/boards/arm/ferris/ferris_rev02_defconfig b/app/boards/pierrechevalier83/ferris/ferris_defconfig
similarity index 84%
rename from app/boards/arm/ferris/ferris_rev02_defconfig
rename to app/boards/pierrechevalier83/ferris/ferris_defconfig
index bd03c3050..eb55b0193 100644
--- a/app/boards/arm/ferris/ferris_rev02_defconfig
+++ b/app/boards/pierrechevalier83/ferris/ferris_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: MIT
 
-CONFIG_BOARD_FERRIS=y
-CONFIG_SOC_SERIES_STM32F0X=y
-CONFIG_SOC_STM32F072XB=y
 # 48MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=48000000