diff --git a/firmware/canfd_cdc_composite/CMakeLists.txt b/firmware/canfd_cdc_composite/CMakeLists.txt
index 0c5e6e4..4fbbbb0 100644
--- a/firmware/canfd_cdc_composite/CMakeLists.txt
+++ b/firmware/canfd_cdc_composite/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.20.0)
 
+# Set board root to find our custom board
+set(BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(ews_canfd_cdc_composite)
 
diff --git a/firmware/canfd_cdc_composite/README.md b/firmware/canfd_cdc_composite/README.md
index d7208de..716b9cc 100644
--- a/firmware/canfd_cdc_composite/README.md
+++ b/firmware/canfd_cdc_composite/README.md
@@ -34,7 +34,7 @@ A Zephyr-based firmware for the EWS board that provides:
 ## Building
 
 ```bash
-west build -b ews_board
+west build -b ews
 ```
 
 ## CDC Protocol
diff --git a/firmware/canfd_cdc_composite/boards/arm/ews/board.cmake b/firmware/canfd_cdc_composite/boards/arm/ews/board.cmake
new file mode 100644
index 0000000..fc5a35f
--- /dev/null
+++ b/firmware/canfd_cdc_composite/boards/arm/ews/board.cmake
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_BOARD_EWS)
+  board_runner_args(jlink "--device=STM32G0B1KB" "--speed=4000")
+  board_runner_args(pyocd "--target=stm32g0b1kbux")
+  
+  include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
+  include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+endif()
\ No newline at end of file
diff --git a/firmware/canfd_cdc_composite/boards/arm/ews_board/board.yml b/firmware/canfd_cdc_composite/boards/arm/ews/board.yml
similarity index 73%
rename from firmware/canfd_cdc_composite/boards/arm/ews_board/board.yml
rename to firmware/canfd_cdc_composite/boards/arm/ews/board.yml
index 5d3995b..5647b82 100644
--- a/firmware/canfd_cdc_composite/boards/arm/ews_board/board.yml
+++ b/firmware/canfd_cdc_composite/boards/arm/ews/board.yml
@@ -1,4 +1,4 @@
-identifier: ews_board
+identifier: ews
 name: EWS Board
 type: mcu
 arch: arm
diff --git a/firmware/canfd_cdc_composite/boards/arm/ews_board/doc/index.rst b/firmware/canfd_cdc_composite/boards/arm/ews/doc/index.rst
similarity index 97%
rename from firmware/canfd_cdc_composite/boards/arm/ews_board/doc/index.rst
rename to firmware/canfd_cdc_composite/boards/arm/ews/doc/index.rst
index 69fad32..1c23ead 100644
--- a/firmware/canfd_cdc_composite/boards/arm/ews_board/doc/index.rst
+++ b/firmware/canfd_cdc_composite/boards/arm/ews/doc/index.rst
@@ -43,5 +43,5 @@ The board supports programming via:
 ## Building Firmware
 
 ```bash
-west build -b ews_board
+west build -b ews
 ```
\ No newline at end of file
diff --git a/firmware/canfd_cdc_composite/boards/arm/ews_board/ews_board.dts b/firmware/canfd_cdc_composite/boards/arm/ews/ews.dts
similarity index 98%
rename from firmware/canfd_cdc_composite/boards/arm/ews_board/ews_board.dts
rename to firmware/canfd_cdc_composite/boards/arm/ews/ews.dts
index 1057fda..6671fed 100644
--- a/firmware/canfd_cdc_composite/boards/arm/ews_board/ews_board.dts
+++ b/firmware/canfd_cdc_composite/boards/arm/ews/ews.dts
@@ -4,7 +4,7 @@
 
 / {
 	model = "EWS Board STM32G0B1KBU6";
-	compatible = "ews,ews-board";
+	compatible = "ews,ews";
 
 	chosen {
 		zephyr,console = &cdc_acm_uart0;
diff --git a/firmware/canfd_cdc_composite/boards/arm/ews_board/ews_board_defconfig b/firmware/canfd_cdc_composite/boards/arm/ews/ews_defconfig
similarity index 100%
rename from firmware/canfd_cdc_composite/boards/arm/ews_board/ews_board_defconfig
rename to firmware/canfd_cdc_composite/boards/arm/ews/ews_defconfig