diff --git a/doc/_scripts/software_maturity/software_maturity_features.yaml b/doc/_scripts/software_maturity/software_maturity_features.yaml
index 4e0262699005..5db87baf649f 100644
--- a/doc/_scripts/software_maturity/software_maturity_features.yaml
+++ b/doc/_scripts/software_maturity/software_maturity_features.yaml
@@ -14,7 +14,7 @@ top_table:
       - SHIELD_NRF7002EK_NRF7001
       - SHIELD_NRF7002EB
       - BOARD_NRF7002DK_NRF5340_CPUAPP
-      - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+      - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
 features:
   sidewalk:
     Sidewalk over BLE: SIDEWALK && SIDEWALK_LINK_MASK_BLE
@@ -75,7 +75,7 @@ features:
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
-        - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+        - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Scan only (for location accuracy):
       rule: WIFI_NRF700X && !WPA_SUPP
       boards_and_shields:
@@ -84,7 +84,7 @@ features:
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
-        - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+        - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Bluetooth LE Co-existence:
       rule: WIFI_NRF700X && NRF700X_SR_COEX
       boards_and_shields:
@@ -92,7 +92,7 @@ features:
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
-        - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+        - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     SoftAP Mode:
       rule: WIFI_NRF700X && NRF700X_AP_MODE && WPA_SUPP_AP
       boards_and_shields:
@@ -101,7 +101,7 @@ features:
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
-        - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+        - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Monitor Mode:
       rule: WIFI_NRF700X && NRF700X_RAW_DATA_RX
       boards_and_shields:
@@ -110,7 +110,7 @@ features:
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
-        - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+        - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     TX injection Mode:
       rule: WIFI_NRF700X && NRF700X_RAW_DATA_TX
       boards_and_shields:
@@ -119,7 +119,7 @@ features:
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
-        - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+        - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Promiscuous Mode:
       rule: WIFI_NRF700X && NRF700X_PROMISC_DATA_RX
       boards_and_shields:
@@ -127,7 +127,7 @@ features:
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
-        - BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP
+        - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
   trusted_firmware_m:
     Minimal Build: BUILD_WITH_TFM && TFM_PROFILE_TYPE_MINIMAL
     Full build: BUILD_WITH_TFM && TFM_PROFILE_TYPE_NOT_SET && NRF_SECURITY
@@ -150,4 +150,4 @@ display_names:
   SHIELD_NRF7002EK_NRF7001: nRF7002 EK in nRF7001 emulation mode
   SHIELD_NRF7002EB: nRF7002 EB
   BOARD_NRF7002DK_NRF5340_CPUAPP: nRF7002 DK
-  BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP: nRF7002 DK in nRF7001 emulation mode
+  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001: nRF7002 DK in nRF7001 emulation mode
diff --git a/doc/_scripts/software_maturity/software_maturity_scanner.py b/doc/_scripts/software_maturity/software_maturity_scanner.py
index babb50cfa518..6d251d8052f6 100644
--- a/doc/_scripts/software_maturity/software_maturity_scanner.py
+++ b/doc/_scripts/software_maturity/software_maturity_scanner.py
@@ -159,7 +159,7 @@
 NRF_SAMPLE_DIR = Path(__file__).absolute().parents[3]
 """Directory containing samples/ and applications/ subfolders."""
 
-BOARD_FILTER = lambda b: re.search(r"_nrf[0-9]+", b) and not b.startswith("nrf51")
+BOARD_FILTER = lambda b: re.search(r"/nrf[0-9]+", b) and not b.startswith("nrf51")
 """Function to filter non-relevant boards."""
 
 
@@ -295,7 +295,7 @@ def find_all_socs(all_samples: List[str]) -> List[str]:
 
     # Only use nRF boards, but not nRF51 series
     all_boards = set(filter(BOARD_FILTER, all_boards))
-    all_socs = {re.findall(r"_(nrf[0-9]+[hlHL]?[0-9]+)", b)[-1] for b in all_boards}
+    all_socs = {b.split("/")[1] for b in all_boards}
     return list(sorted(all_socs))