diff --git a/doc/services/tfm/requirements.rst b/doc/services/tfm/requirements.rst
index 58f573821e4..7110139bda5 100644
--- a/doc/services/tfm/requirements.rst
+++ b/doc/services/tfm/requirements.rst
@@ -23,9 +23,9 @@ The following are some of the boards that can be used with TF-M:
    * - :ref:`b_u585i_iot02a_board`
      - ``b_u585i_iot02a_ns``
    * - :ref:`nucleo_l552ze_q_board`
-     - ``nucleo_l552ze_q_ns``
+     - ``nucleo_l552ze_q/stm32l552xx/ns``
    * - :ref:`stm32l562e_dk_board`
-     - ``stm32l562e_dk_ns``
+     - ``stm32l562e_dk/stm32l562xx/ns``
    * - :ref:`v2m_musca_b1_board`
      - ``v2m_musca_b1_ns``
    * - :ref:`v2m_musca_s1_board`
diff --git a/samples/subsys/usb/dfu/sample.yaml b/samples/subsys/usb/dfu/sample.yaml
index f74c6327c86..b1befddb016 100644
--- a/samples/subsys/usb/dfu/sample.yaml
+++ b/samples/subsys/usb/dfu/sample.yaml
@@ -19,7 +19,7 @@ common:
     - b_u585i_iot02a
     - frdm_kl25z
     - lpcxpresso55s69_cpu0
-    - stm32l562e_dk_ns
+    - stm32l562e_dk/stm32l562xx/ns
   depends_on: usb_device
   filter: dt_label_with_parent_compat_enabled("slot0_partition", "fixed-partitions")
     and dt_label_with_parent_compat_enabled("slot1_partition", "fixed-partitions")
diff --git a/samples/tfm_integration/psa_crypto/sample.yaml b/samples/tfm_integration/psa_crypto/sample.yaml
index 45c9940b021..01c059cb133 100644
--- a/samples/tfm_integration/psa_crypto/sample.yaml
+++ b/samples/tfm_integration/psa_crypto/sample.yaml
@@ -13,7 +13,7 @@ tests:
       - mcuboot
     platform_allow: mps2_an521_ns v2m_musca_s1_ns
       nrf5340dk_nrf5340_cpuapp_ns nrf9160dk_nrf9160_ns
-      stm32l562e_dk_ns bl5340_dvk_cpuapp_ns
+      stm32l562e_dk/stm32l562xx/ns bl5340_dvk_cpuapp_ns
     harness: console
     harness_config:
       type: multi_line
diff --git a/samples/tfm_integration/tfm_ipc/README.rst b/samples/tfm_integration/tfm_ipc/README.rst
index dc5233c7fc5..4354d366346 100644
--- a/samples/tfm_integration/tfm_ipc/README.rst
+++ b/samples/tfm_integration/tfm_ipc/README.rst
@@ -118,7 +118,7 @@ Build Zephyr with a non-secure configuration:
 
    .. code-block:: bash
 
-      $ west build -b nucleo_l552ze_q_ns samples/tfm_integration/tfm_ipc/
+      $ west build -b nucleo_l552ze_q/stm32l552xx/ns samples/tfm_integration/tfm_ipc/
 
    Example, for building non-secure configuration for STM32L562E-DK Discovery
 
diff --git a/samples/tfm_integration/tfm_ipc/sample.yaml b/samples/tfm_integration/tfm_ipc/sample.yaml
index 4537b5c48dc..d03e3df2d3c 100644
--- a/samples/tfm_integration/tfm_ipc/sample.yaml
+++ b/samples/tfm_integration/tfm_ipc/sample.yaml
@@ -12,8 +12,8 @@ tests:
       - mps2_an521_ns
       - nrf5340dk_nrf5340_cpuapp_ns
       - nrf9160dk_nrf9160_ns
-      - nucleo_l552ze_q_ns
-      - stm32l562e_dk_ns
+      - nucleo_l552ze_q/stm32l552xx/ns
+      - stm32l562e_dk/stm32l562xx/ns
       - v2m_musca_s1_ns
       - bl5340_dvk_cpuapp_ns
       - b_u585i_iot02a_ns
diff --git a/tests/arch/arm/arm_thread_swap_tz/testcase.yaml b/tests/arch/arm/arm_thread_swap_tz/testcase.yaml
index d12173451b1..fc488884b28 100644
--- a/tests/arch/arm/arm_thread_swap_tz/testcase.yaml
+++ b/tests/arch/arm/arm_thread_swap_tz/testcase.yaml
@@ -10,7 +10,7 @@ tests:
     # NOTE: this platform disables FPU access in TFM.
     platform_exclude:
       - mps3/an547/ns
-      - nucleo_l552ze_q_ns
+      - nucleo_l552ze_q/stm32l552xx/ns
     integration_platforms:
       - mps2_an521_ns
   arch.arm.swap.tz_off:
@@ -19,6 +19,6 @@ tests:
     # NOTE: this platform disables FPU access in TFM.
     platform_exclude:
       - mps3/an547/ns
-      - nucleo_l552ze_q_ns
+      - nucleo_l552ze_q/stm32l552xx/ns
     integration_platforms:
       - mps2_an521_ns
diff --git a/tests/drivers/flash/common/testcase.yaml b/tests/drivers/flash/common/testcase.yaml
index c7a60cbff5c..672c347ff69 100644
--- a/tests/drivers/flash/common/testcase.yaml
+++ b/tests/drivers/flash/common/testcase.yaml
@@ -57,7 +57,7 @@ tests:
       - nucleo_wb55rg
       - nucleo_wl55jc
       - stm32l562e_dk
-      - stm32l562e_dk_ns
+      - stm32l562e_dk/stm32l562xx/ns
     integration_platforms:
       - nucleo_f103rb
     filter: (dt_compat_enabled("st,stm32-flash-controller") or