diff --git a/samples/bluetooth/beacon/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/beacon/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/beacon/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/beacon/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/broadcaster/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/broadcaster/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/broadcaster/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/broadcaster/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/central/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/central/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/central/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/central/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/central_hr/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/central_hr/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/central_hr/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/central_hr/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/eddystone/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/eddystone/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/eddystone/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/eddystone/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/hci_uart/boards/rv32m1_vega_ri5cy.conf b/samples/bluetooth/hci_uart/boards/rv32m1_vega_openisa_rv32m1_ri5cy.conf
similarity index 100%
rename from samples/bluetooth/hci_uart/boards/rv32m1_vega_ri5cy.conf
rename to samples/bluetooth/hci_uart/boards/rv32m1_vega_openisa_rv32m1_ri5cy.conf
diff --git a/samples/bluetooth/hci_uart/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/hci_uart/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/hci_uart/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/hci_uart/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/ibeacon/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/ibeacon/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/ibeacon/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/ibeacon/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/ipsp/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/ipsp/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/ipsp/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/ipsp/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/mesh/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/mesh/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/mesh/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/mesh/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/mesh_demo/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/mesh_demo/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/mesh_demo/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/mesh_demo/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/observer/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/observer/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/observer/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/observer/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral_csc/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral_csc/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral_csc/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral_csc/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral_dis/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral_dis/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral_dis/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral_dis/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral_esp/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral_esp/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral_esp/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral_esp/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral_hids/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral_hids/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral_hids/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral_hids/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral_hr/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral_hr/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral_hr/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral_hr/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral_ht/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral_ht/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral_ht/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral_ht/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/peripheral_sc_only/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/peripheral_sc_only/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/peripheral_sc_only/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/peripheral_sc_only/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/bluetooth/scan_adv/boards/rv32m1_vega_ri5cy.overlay b/samples/bluetooth/scan_adv/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from samples/bluetooth/scan_adv/boards/rv32m1_vega_ri5cy.overlay
rename to samples/bluetooth/scan_adv/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/samples/drivers/adc/boards/longan_nano_lite.overlay b/samples/drivers/adc/boards/longan_nano_gd32vf103_lite.overlay
similarity index 100%
rename from samples/drivers/adc/boards/longan_nano_lite.overlay
rename to samples/drivers/adc/boards/longan_nano_gd32vf103_lite.overlay
diff --git a/samples/drivers/counter/alarm/boards/bl5340_dvk_cpuapp.conf b/samples/drivers/counter/alarm/boards/bl5340_dvk_nrf5340_cpuapp.conf
similarity index 100%
rename from samples/drivers/counter/alarm/boards/bl5340_dvk_cpuapp.conf
rename to samples/drivers/counter/alarm/boards/bl5340_dvk_nrf5340_cpuapp.conf
diff --git a/samples/drivers/counter/alarm/boards/bl5340_dvk_cpuapp.overlay b/samples/drivers/counter/alarm/boards/bl5340_dvk_nrf5340_cpuapp.overlay
similarity index 100%
rename from samples/drivers/counter/alarm/boards/bl5340_dvk_cpuapp.overlay
rename to samples/drivers/counter/alarm/boards/bl5340_dvk_nrf5340_cpuapp.overlay
diff --git a/samples/drivers/counter/alarm/boards/stm32l562e_dk_ns.conf b/samples/drivers/counter/alarm/boards/stm32l562e_dk_stm32l562xx_ns.conf
similarity index 100%
rename from samples/drivers/counter/alarm/boards/stm32l562e_dk_ns.conf
rename to samples/drivers/counter/alarm/boards/stm32l562e_dk_stm32l562xx_ns.conf
diff --git a/samples/drivers/dac/boards/bl5340_dvk_cpuapp.overlay b/samples/drivers/dac/boards/bl5340_dvk_nrf5340_cpuapp.overlay
similarity index 100%
rename from samples/drivers/dac/boards/bl5340_dvk_cpuapp.overlay
rename to samples/drivers/dac/boards/bl5340_dvk_nrf5340_cpuapp.overlay
diff --git a/samples/drivers/dac/boards/longan_nano_lite.overlay b/samples/drivers/dac/boards/longan_nano_gd32vf103_lite.overlay
similarity index 100%
rename from samples/drivers/dac/boards/longan_nano_lite.overlay
rename to samples/drivers/dac/boards/longan_nano_gd32vf103_lite.overlay
diff --git a/samples/drivers/led_lpd8806/boards/96b_carbon.conf b/samples/drivers/led_lpd8806/boards/96b_carbon_stm32f401xe.conf
similarity index 100%
rename from samples/drivers/led_lpd8806/boards/96b_carbon.conf
rename to samples/drivers/led_lpd8806/boards/96b_carbon_stm32f401xe.conf
diff --git a/samples/drivers/led_lpd8806/boards/96b_carbon.overlay b/samples/drivers/led_lpd8806/boards/96b_carbon_stm32f401xe.overlay
similarity index 100%
rename from samples/drivers/led_lpd8806/boards/96b_carbon.overlay
rename to samples/drivers/led_lpd8806/boards/96b_carbon_stm32f401xe.overlay
diff --git a/samples/subsys/display/cfb/boards/reel_board_v2.conf b/samples/subsys/display/cfb/boards/reel_board_v2.conf
deleted file mode 100644
index 5616bfc48d7..00000000000
--- a/samples/subsys/display/cfb/boards/reel_board_v2.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI=y
diff --git a/samples/subsys/fs/littlefs/boards/stm32h747i_disco_m7.conf b/samples/subsys/fs/littlefs/boards/stm32h747i_disco_stm32h747xx_m7.conf
similarity index 100%
rename from samples/subsys/fs/littlefs/boards/stm32h747i_disco_m7.conf
rename to samples/subsys/fs/littlefs/boards/stm32h747i_disco_stm32h747xx_m7.conf
diff --git a/samples/subsys/fs/littlefs/boards/stm32h747i_disco_m7.overlay b/samples/subsys/fs/littlefs/boards/stm32h747i_disco_stm32h747xx_m7.overlay
similarity index 100%
rename from samples/subsys/fs/littlefs/boards/stm32h747i_disco_m7.overlay
rename to samples/subsys/fs/littlefs/boards/stm32h747i_disco_stm32h747xx_m7.overlay
diff --git a/samples/subsys/ipc/rpmsg_service/boards/bl5340_dvk_cpuapp.conf b/samples/subsys/ipc/rpmsg_service/boards/bl5340_dvk_nrf5340_cpuapp.conf
similarity index 100%
rename from samples/subsys/ipc/rpmsg_service/boards/bl5340_dvk_cpuapp.conf
rename to samples/subsys/ipc/rpmsg_service/boards/bl5340_dvk_nrf5340_cpuapp.conf
diff --git a/samples/subsys/usb/mass/boards/stm32l562e_dk_ns.conf b/samples/subsys/usb/mass/boards/stm32l562e_dk_stm32l562xx_ns.conf
similarity index 100%
rename from samples/subsys/usb/mass/boards/stm32l562e_dk_ns.conf
rename to samples/subsys/usb/mass/boards/stm32l562e_dk_stm32l562xx_ns.conf
diff --git a/tests/arch/common/ramfunc/boards/arty_a7_arm_designstart_m1.overlay b/tests/arch/common/ramfunc/boards/arty_a7_designstart_fpga_cortex_m1.overlay
similarity index 100%
rename from tests/arch/common/ramfunc/boards/arty_a7_arm_designstart_m1.overlay
rename to tests/arch/common/ramfunc/boards/arty_a7_designstart_fpga_cortex_m1.overlay
diff --git a/tests/drivers/adc/adc_api/boards/arduino_nano_33_ble_sense.overlay b/tests/drivers/adc/adc_api/boards/arduino_nano_33_ble_nrf52840_sense.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/arduino_nano_33_ble_sense.overlay
rename to tests/drivers/adc/adc_api/boards/arduino_nano_33_ble_nrf52840_sense.overlay
diff --git a/tests/drivers/adc/adc_api/boards/rpi_pico_w.overlay b/tests/drivers/adc/adc_api/boards/rpi_pico_rp2040_w.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/rpi_pico_w.overlay
rename to tests/drivers/adc/adc_api/boards/rpi_pico_rp2040_w.overlay
diff --git a/tests/drivers/adc/adc_api/boards/xiao_ble_sense.overlay b/tests/drivers/adc/adc_api/boards/xiao_ble_nrf52840_sense.overlay
similarity index 100%
rename from tests/drivers/adc/adc_api/boards/xiao_ble_sense.overlay
rename to tests/drivers/adc/adc_api/boards/xiao_ble_nrf52840_sense.overlay
diff --git a/tests/drivers/build_all/counter/boards/arty_a7_arm_designstart_m1.overlay b/tests/drivers/build_all/counter/boards/arty_a7_designstart_fpga_cortex_m1.overlay
similarity index 100%
rename from tests/drivers/build_all/counter/boards/arty_a7_arm_designstart_m1.overlay
rename to tests/drivers/build_all/counter/boards/arty_a7_designstart_fpga_cortex_m1.overlay
diff --git a/tests/drivers/build_all/pwm/boards/arty_a7_arm_designstart_m1.overlay b/tests/drivers/build_all/pwm/boards/arty_a7_designstart_fpga_cortex_m1.overlay
similarity index 100%
rename from tests/drivers/build_all/pwm/boards/arty_a7_arm_designstart_m1.overlay
rename to tests/drivers/build_all/pwm/boards/arty_a7_designstart_fpga_cortex_m1.overlay
diff --git a/tests/drivers/counter/counter_basic_api/boards/stm32h747i_disco_m7.overlay b/tests/drivers/counter/counter_basic_api/boards/stm32h747i_disco_stm32h747xx_m7.overlay
similarity index 100%
rename from tests/drivers/counter/counter_basic_api/boards/stm32h747i_disco_m7.overlay
rename to tests/drivers/counter/counter_basic_api/boards/stm32h747i_disco_stm32h747xx_m7.overlay
diff --git a/tests/drivers/dma/loop_transfer/boards/longan_nano_lite.overlay b/tests/drivers/dma/loop_transfer/boards/longan_nano_gd32vf103_lite.overlay
similarity index 100%
rename from tests/drivers/dma/loop_transfer/boards/longan_nano_lite.overlay
rename to tests/drivers/dma/loop_transfer/boards/longan_nano_gd32vf103_lite.overlay
diff --git a/tests/drivers/flash/common/boards/b_u585i_iot02a_ns.overlay b/tests/drivers/flash/common/boards/b_u585i_iot02a_stm32u585xx_ns.overlay
similarity index 100%
rename from tests/drivers/flash/common/boards/b_u585i_iot02a_ns.overlay
rename to tests/drivers/flash/common/boards/b_u585i_iot02a_stm32u585xx_ns.overlay
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/bl5340_dvk_cpuapp.overlay b/tests/drivers/gpio/gpio_basic_api/boards/bl5340_dvk_nrf5340_cpuapp.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_basic_api/boards/bl5340_dvk_cpuapp.overlay
rename to tests/drivers/gpio/gpio_basic_api/boards/bl5340_dvk_nrf5340_cpuapp.overlay
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/rv32m1_vega_ri5cy.overlay b/tests/drivers/gpio/gpio_basic_api/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_basic_api/boards/rv32m1_vega_ri5cy.overlay
rename to tests/drivers/gpio/gpio_basic_api/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/tests/drivers/gpio/gpio_basic_api/boards/stm32h747i_disco_m7.overlay b/tests/drivers/gpio/gpio_basic_api/boards/stm32h747i_disco_stm32h747xx_m7.overlay
similarity index 100%
rename from tests/drivers/gpio/gpio_basic_api/boards/stm32h747i_disco_m7.overlay
rename to tests/drivers/gpio/gpio_basic_api/boards/stm32h747i_disco_stm32h747xx_m7.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/96b_carbon.conf b/tests/drivers/spi/spi_loopback/boards/96b_carbon_stm32f401xe.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/96b_carbon.conf
rename to tests/drivers/spi/spi_loopback/boards/96b_carbon_stm32f401xe.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/96b_carbon.overlay b/tests/drivers/spi/spi_loopback/boards/96b_carbon_stm32f401xe.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/96b_carbon.overlay
rename to tests/drivers/spi/spi_loopback/boards/96b_carbon_stm32f401xe.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/arty_a7_arm_designstart_m1.conf b/tests/drivers/spi/spi_loopback/boards/arty_a7_designstart_fpga_cortex_m1.conf
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/arty_a7_arm_designstart_m1.conf
rename to tests/drivers/spi/spi_loopback/boards/arty_a7_designstart_fpga_cortex_m1.conf
diff --git a/tests/drivers/spi/spi_loopback/boards/arty_a7_arm_designstart_m1.overlay b/tests/drivers/spi/spi_loopback/boards/arty_a7_designstart_fpga_cortex_m1.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/arty_a7_arm_designstart_m1.overlay
rename to tests/drivers/spi/spi_loopback/boards/arty_a7_designstart_fpga_cortex_m1.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/longan_nano_lite.overlay b/tests/drivers/spi/spi_loopback/boards/longan_nano_gd32vf103_lite.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/longan_nano_lite.overlay
rename to tests/drivers/spi/spi_loopback/boards/longan_nano_gd32vf103_lite.overlay
diff --git a/tests/drivers/spi/spi_loopback/boards/rv32m1_vega_ri5cy.overlay b/tests/drivers/spi/spi_loopback/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
similarity index 100%
rename from tests/drivers/spi/spi_loopback/boards/rv32m1_vega_ri5cy.overlay
rename to tests/drivers/spi/spi_loopback/boards/rv32m1_vega_openisa_rv32m1_ri5cy.overlay
diff --git a/tests/drivers/uart/uart_async_api/boards/stm32l562e_dk_ns.overlay b/tests/drivers/uart/uart_async_api/boards/stm32l562e_dk_stm32l562xx_ns.overlay
similarity index 100%
rename from tests/drivers/uart/uart_async_api/boards/stm32l562e_dk_ns.overlay
rename to tests/drivers/uart/uart_async_api/boards/stm32l562e_dk_stm32l562xx_ns.overlay
diff --git a/tests/kernel/mem_protect/mem_map/boards/qemu_cortex_a53_smp.conf b/tests/kernel/mem_protect/mem_map/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
similarity index 100%
rename from tests/kernel/mem_protect/mem_map/boards/qemu_cortex_a53_smp.conf
rename to tests/kernel/mem_protect/mem_map/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
diff --git a/tests/kernel/mem_protect/mem_protect/boards/qemu_cortex_a53_smp.conf b/tests/kernel/mem_protect/mem_protect/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
similarity index 100%
rename from tests/kernel/mem_protect/mem_protect/boards/qemu_cortex_a53_smp.conf
rename to tests/kernel/mem_protect/mem_protect/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
diff --git a/tests/kernel/smp/boards/qemu_cortex_a53_smp.conf b/tests/kernel/smp/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
similarity index 100%
rename from tests/kernel/smp/boards/qemu_cortex_a53_smp.conf
rename to tests/kernel/smp/boards/qemu_cortex_a53_qemu_cortex_a53_smp.conf
diff --git a/tests/kernel/smp/boards/qemu_cortex_a53_smp.overlay b/tests/kernel/smp/boards/qemu_cortex_a53_qemu_cortex_a53_smp.overlay
similarity index 100%
rename from tests/kernel/smp/boards/qemu_cortex_a53_smp.overlay
rename to tests/kernel/smp/boards/qemu_cortex_a53_qemu_cortex_a53_smp.overlay
diff --git a/tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv32_smp.conf b/tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv32_smp.conf
rename to tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv64_smp.conf b/tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv64_smp.conf
rename to tests/subsys/mgmt/mcumgr/cb_notifications/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv32_smp.conf b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv32_smp.conf
rename to tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv64_smp.conf b/tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv64_smp.conf
rename to tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_smp.conf b/tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_smp.conf
rename to tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_smp.overlay b/tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_qemu_virt_riscv64_smp.overlay
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_smp.overlay
rename to tests/subsys/mgmt/mcumgr/os_mgmt_datetime/boards/qemu_riscv64_qemu_virt_riscv64_smp.overlay
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv32_smp.conf b/tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv32_smp.conf
rename to tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv64_smp.conf b/tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv64_smp.conf
rename to tests/subsys/mgmt/mcumgr/os_mgmt_echo/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv32_smp.conf b/tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv32_smp.conf
rename to tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv64_smp.conf b/tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv64_smp.conf
rename to tests/subsys/mgmt/mcumgr/os_mgmt_info/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv32_smp.conf b/tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv32_smp.conf
rename to tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv32_qemu_virt_riscv32_smp.conf
diff --git a/tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv64_smp.conf b/tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf
similarity index 100%
rename from tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv64_smp.conf
rename to tests/subsys/mgmt/mcumgr/smp_version/boards/qemu_riscv64_qemu_virt_riscv64_smp.conf