diff --git a/boards/arm/zest_core_stm32l4a6rg/Kconfig.board b/boards/arm/zest_core_stm32l4a6rg/Kconfig.board
deleted file mode 100644
index 70e076a..0000000
--- a/boards/arm/zest_core_stm32l4a6rg/Kconfig.board
+++ /dev/null
@@ -1,8 +0,0 @@
-# Zest Core STM32L4A6RG board configuration
-
-# Copyright (c) 2023 CATIE
-# SPDX-License-Identifier: Apache-2.0
-
-config BOARD_ZEST_CORE_STM32L4A6RG
-	bool "Zest Core STM32L4A6RG Development Board"
-	depends on SOC_STM32L4A6XX
diff --git a/boards/arm/zest_core_stm32l4a6rg/Kconfig.defconfig b/boards/arm/zest_core_stm32l4a6rg/Kconfig.defconfig
deleted file mode 100644
index 9f1053a..0000000
--- a/boards/arm/zest_core_stm32l4a6rg/Kconfig.defconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-# Zest Core STM32L4A6RG board configuration
-
-# Copyright (c) 2023 CATIE
-# SPDX-License-Identifier: Apache-2.0
-
-if BOARD_ZEST_CORE_STM32L4A6RG
-
-config BOARD
-	default "zest_core_stm32l4a6rg"
-
-endif # BOARD_ZEST_CORE_STM32L4A6RG
diff --git a/boards/catie/zest_core_stm32l4a6rg/Kconfig.zest_core_stm32l4a6rg b/boards/catie/zest_core_stm32l4a6rg/Kconfig.zest_core_stm32l4a6rg
new file mode 100644
index 0000000..b099e53
--- /dev/null
+++ b/boards/catie/zest_core_stm32l4a6rg/Kconfig.zest_core_stm32l4a6rg
@@ -0,0 +1,5 @@
+# Copyright (c) 2023 CATIE
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_ZEST_CORE_STM32L4A6RG
+	select SOC_STM32L4A6XX
diff --git a/boards/arm/zest_core_stm32l4a6rg/board.cmake b/boards/catie/zest_core_stm32l4a6rg/board.cmake
similarity index 100%
rename from boards/arm/zest_core_stm32l4a6rg/board.cmake
rename to boards/catie/zest_core_stm32l4a6rg/board.cmake
diff --git a/boards/catie/zest_core_stm32l4a6rg/board.yml b/boards/catie/zest_core_stm32l4a6rg/board.yml
new file mode 100644
index 0000000..dc39ced
--- /dev/null
+++ b/boards/catie/zest_core_stm32l4a6rg/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: zest_core_stm32l4a6rg
+  vendor: catie
+  socs:
+    - name: stm32l4a6xx
diff --git a/boards/arm/zest_core_stm32l4a6rg/revision.cmake b/boards/catie/zest_core_stm32l4a6rg/revision.cmake
similarity index 100%
rename from boards/arm/zest_core_stm32l4a6rg/revision.cmake
rename to boards/catie/zest_core_stm32l4a6rg/revision.cmake
diff --git a/boards/arm/zest_core_stm32l4a6rg/sixtron_connector.dtsi b/boards/catie/zest_core_stm32l4a6rg/sixtron_connector.dtsi
similarity index 100%
rename from boards/arm/zest_core_stm32l4a6rg/sixtron_connector.dtsi
rename to boards/catie/zest_core_stm32l4a6rg/sixtron_connector.dtsi
diff --git a/boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.dts b/boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.dts
similarity index 100%
rename from boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.dts
rename to boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.dts
diff --git a/boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.yaml b/boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.yaml
similarity index 100%
rename from boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.yaml
rename to boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg.yaml
diff --git a/boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_3_1_0.overlay b/boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_3_1_0.overlay
similarity index 100%
rename from boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_3_1_0.overlay
rename to boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_3_1_0.overlay
diff --git a/boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_defconfig b/boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_defconfig
similarity index 84%
rename from boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_defconfig
rename to boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_defconfig
index 7b06261..966ba2b 100644
--- a/boards/arm/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_defconfig
+++ b/boards/catie/zest_core_stm32l4a6rg/zest_core_stm32l4a6rg_defconfig
@@ -1,9 +1,6 @@
 # Copyright (c) 2023 CATIE
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_SOC_SERIES_STM32L4X=y
-CONFIG_SOC_STM32L4A6XX=y
-
 # enable uart driver
 CONFIG_SERIAL=y