diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 8e61eb0e15..786eb06e44 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -2885,7 +2885,6 @@ West:
   files:
     - modules/canopennode/
   labels:
-    - manifest-canopennode
     - "area: CAN"
 
 "West project: chre":
@@ -2895,7 +2894,7 @@ West:
   files:
     - samples/modules/chre/
   labels:
-    - manifest-chre
+    - "area: CHRE"
 
 "West project: cmsis":
   status: maintained
@@ -2909,7 +2908,7 @@ West:
     - modules/cmsis/Kconfig.cmsis_dsp
     - modules/cmsis/Kconfig.cmsis_nn
   labels:
-    - manifest-cmsis
+    - "area: ARM"
 
 "West project: edtt":
   status: maintained
@@ -2920,7 +2919,7 @@ West:
     - thoh-ot
   files: []
   labels:
-    - manifest-edtt
+    - "area: Tests"
 
 "West project: fatfs":
   status: maintained
@@ -2929,7 +2928,7 @@ West:
   files:
     - modules/fatfs/
   labels:
-    - manifest-fatfs
+    - "area: Storage"
 
 "West project: hal_altera":
   status: odd fixes
@@ -2938,7 +2937,7 @@ West:
   files:
     - modules/Kconfig.altera
   labels:
-    - manifest-hal_altera
+    - "platform: Altera"
 
 "West project: hal_ambiq":
   status: maintained
@@ -2949,7 +2948,7 @@ West:
     - msobkowski
   files: []
   labels:
-    - manifest-hal_ambiq
+    - "platform: Ambiq"
 
 "West project: hal_atmel":
   status: maintained
@@ -2960,7 +2959,7 @@ West:
   files:
     - modules/Kconfig.atmel
   labels:
-    - manifest-hal_atmel
+    - "platform: Microchip SAM"
 
 "West project: hal_cypress":
   status: maintained
@@ -2972,7 +2971,7 @@ West:
   files:
     - modules/Kconfig.cypress
   labels:
-    - manifest-hal_cypress
+    - "platform: Infineon"
 
 "West project: hal_espressif":
   status: maintained
@@ -2984,7 +2983,7 @@ West:
     - LucasTambor
   files: []
   labels:
-    - manifest-hal_espressif
+    - "platform: ESP32"
 
 "West project: hal_gigadevice":
   status: maintained
@@ -2996,7 +2995,7 @@ West:
   files:
     - modules/hal_gigadevice/
   labels:
-    - manifest-hal_gigadevice
+    - "platform: GD32"
 
 "West project: hal_infineon":
   status: maintained
@@ -3010,7 +3009,7 @@ West:
     - modules/Kconfig.infineon
     - modules/hal_infineon/
   labels:
-    - manifest-hal_infineon
+    - "platform: Infineon"
 
 "West project: hal_microchip":
   status: maintained
@@ -3022,7 +3021,8 @@ West:
   files:
     - modules/Kconfig.microchip
   labels:
-    - manifest-hal_microchip
+    - "platform: Microchip SAM"
+    - "platform: Microchip MEC"
 
 "West project: hal_nordic":
   status: maintained
@@ -3034,7 +3034,7 @@ West:
   files:
     - modules/hal_nordic/
   labels:
-    - manifest-hal_nordic
+    - "platform: nRF"
 
 "West project: hal_nuvoton":
   status: maintained
@@ -3043,7 +3043,7 @@ West:
   files:
     - modules/Kconfig.nuvoton
   labels:
-    - manifest-hal_nuvoton
+    - "platform: Nuvoton"
 
 "West project: hal_nxp":
   status: maintained
@@ -3061,7 +3061,7 @@ West:
     - modules/Kconfig.mcux
     - modules/Kconfig.nxp_s32
   labels:
-    - manifest-hal_nxp
+    - "platform: NXP"
 
 "West project: hal_openisa":
   status: odd fixes
@@ -3070,7 +3070,7 @@ West:
   files:
     - modules/Kconfig.vega
   labels:
-    - manifest-hal_openisa
+    - "platform: openisa/RV32M1"
 
 "West project: hal_quicklogic":
   status: odd fixes
@@ -3078,7 +3078,7 @@ West:
     - fkokosinski
   files: []
   labels:
-    - manifest-hal_quicklogic
+    - "platform: Quicklogic"
 
 "West project: hal_renesas":
   status: maintained
@@ -3086,7 +3086,7 @@ West:
     - andrzej-kaczmarek
   files: []
   labels:
-    - manifest-hal_renesas
+    - "platform: Renesas"
 
 "West project: hal_rpi_pico":
   status: maintained
@@ -3095,7 +3095,7 @@ West:
   files:
     - modules/hal_rpi_pico/
   labels:
-    - manifest-hal_rpi_pico
+    - "platform: Raspberry Pi Pico"
 
 "West project: hal_silabs":
   status: maintained
@@ -3108,7 +3108,7 @@ West:
   files:
     - modules/Kconfig.silabs
   labels:
-    - manifest-hal_silabs
+    - "platform: SiLabs"
 
 "West project: hal_st":
   status: maintained
@@ -3119,7 +3119,7 @@ West:
   files:
     - modules/Kconfig.st
   labels:
-    - manifest-hal_st
+    - "area: Sensors"
 
 "West project: hal_stm32":
   status: maintained
@@ -3133,7 +3133,7 @@ West:
   files:
     - modules/Kconfig.stm32
   labels:
-    - manifest-hal_stm32
+    - "platform: STM32"
 
 "West project: hal_telink":
   status: maintained
@@ -3142,7 +3142,7 @@ West:
   files:
     - modules/Kconfig.telink
   labels:
-    - manifest-hal_telink
+    - "platform: Telink"
 
 "West project: hal_ti":
   status: maintained
@@ -3152,7 +3152,7 @@ West:
     - cfriedt
   files: []
   labels:
-    - manifest-hal_ti
+    - "platform: TI"
 
 "West project: hal_wurthelektronik":
   status: maintained
@@ -3161,7 +3161,7 @@ West:
   files:
     - modules/Kconfig.wurthelektronik
   labels:
-    - manifest-hal_wurthelektronik
+    - "area: Sensors"
 
 "West project: hal_xtensa":
   status: maintained
@@ -3173,7 +3173,7 @@ West:
   files:
     - modules/Kconfig.xtensa
   labels:
-    - manifest-hal_xtensa
+    - "area: Xtensa"
 
 "West project: hal_intel":
   status: maintained
@@ -3185,7 +3185,7 @@ West:
   files:
     - modules/Kconfig.intel
   labels:
-    - manifest-hal_intel
+    - "platform: Intel"
 
 "West project: libmetal":
   status: odd fixes
@@ -3195,7 +3195,7 @@ West:
   files:
     - modules/Kconfig.libmetal
   labels:
-    - manifest-libmetal
+    - "area: AMP"
 
 "West project: liblc3":
   status: maintained
@@ -3208,14 +3208,14 @@ West:
   files:
     - modules/liblc3/
   labels:
-    - manifest-liblc3
+    - "area: Audio"
 
 "West project: littlefs":
   status: odd fixes
   files:
     - modules/littlefs/
   labels:
-    - manifest-littlefs
+    - "area: Storage"
 
 "West project: loramac-node":
   status: maintained
@@ -3224,7 +3224,7 @@ West:
   files:
     - modules/loramac-node/
   labels:
-    - manifest-loramac-node
+    - "area: LoRa"
 
 "West project: lvgl":
   status: maintained
@@ -3237,7 +3237,7 @@ West:
     - modules/lvgl/
     - tests/lib/gui/lvgl/
   labels:
-    - manifest-lvgl
+    - "area: LVGL"
 
 "West project: lz4":
   status: odd fixes
@@ -3246,7 +3246,7 @@ West:
   files:
     - modules/lz4/
   labels:
-    - manifest-lz4
+    - "area: Compression"
 
 "West project: mbedtls":
   status: maintained
@@ -3256,7 +3256,7 @@ West:
   files:
     - modules/mbedtls/
   labels:
-    - manifest-mbedtls
+    - "area: Crypto / RNG"
 
 "West project: mcuboot":
   status: maintained
@@ -3269,7 +3269,7 @@ West:
     - modules/Kconfig.mcuboot
     - tests/boot/test_mcuboot/
   labels:
-    - manifest-mcuboot
+    - "area: MCUBoot"
 
 "West project: mipi-sys-t":
   status: odd fixes
@@ -3278,7 +3278,7 @@ West:
   files:
     - modules/Kconfig.syst
   labels:
-    - manifest-mipi-sys-t
+    - "area: Tracing"
 
 "West project: nanopb":
   status: odd fixes
@@ -3288,7 +3288,7 @@ West:
     - modules/nanopb/
     - samples/modules/nanopb/
   labels:
-    - manifest-nanopb
+    - "area: Serialization"
 
 "West project: net-tools":
   status: odd fixes
@@ -3298,7 +3298,7 @@ West:
     - rlubos
   files: []
   labels:
-    - manifest-net-tools
+    - "area: Networking"
 
 "West project: nrf_hw_models":
   status: maintained
@@ -3309,7 +3309,7 @@ West:
     - thoh-ot
   files: []
   labels:
-    - manifest-nrf_hw_models
+    - "area: native port"
 
 "West project: open-amp":
   status: odd fixes
@@ -3318,7 +3318,7 @@ West:
   files:
     - modules/Kconfig.open-amp
   labels:
-    - manifest-open-amp
+    - "area: AMP"
 
 "West project: openthread":
   status: maintained
@@ -3331,7 +3331,7 @@ West:
   files:
     - modules/openthread/
   labels:
-    - manifest-openthread
+    - "area: OpenThread"
 
 "West project: picolibc":
   status: maintained
@@ -3341,7 +3341,8 @@ West:
     - stephanosio
   files: []
   labels:
-    - manifest-picolibc
+    - "area: C Library"
+    - "area: picolibc"
 
 "West project: segger":
   status: odd fixes
@@ -3350,7 +3351,7 @@ West:
   files:
     - modules/segger/
   labels:
-    - manifest-segger
+    - "area: Debugging"
 
 "West project: sof":
   status: maintained
@@ -3365,7 +3366,7 @@ West:
   files:
     - modules/Kconfig.sof
   labels:
-    - manifest-sof
+    - "area: Audio"
 
 "West project: tflite-micro":
   status: odd fixes
@@ -3375,7 +3376,7 @@ West:
     - modules/tflite-micro/
     - samples/modules/tflite-micro/
   labels:
-    - manifest-tflite-micro
+    - "area: Neural Networks"
 
 "West project: thrift":
   status: maintained
@@ -3386,14 +3387,15 @@ West:
     - samples/modules/thrift/
     - tests/lib/thrift/
   labels:
-    - manifest-thrift
+    - "area: Thrift"
+    - "area: Serialization"
 
 "West project: tinycrypt":
   status: odd fixes
   files:
     - modules/Kconfig.tinycrypt
   labels:
-    - manifest-tinycrypt
+    - "area: Crypto / RNG"
 
 "West project: TraceRecorderSource":
   status: maintained
@@ -3402,7 +3404,7 @@ West:
   files:
     - modules/TraceRecorder/
   labels:
-    - manifest-TraceRecorderSource
+    - "area: Tracing"
 
 "West project: trusted-firmware-m":
   status: maintained
@@ -3414,7 +3416,7 @@ West:
   files:
     - modules/trusted-firmware-m/
   labels:
-    - manifest-trusted-firmware-m
+    - "area: TF-M"
 
 "West project: tf-m-tests":
   status: maintained
@@ -3425,7 +3427,7 @@ West:
     - SebastianBoe
   files: []
   labels:
-    - manifest-tf-m-tests
+    - "area: TF-M"
 
 "West project: trusted-firmware-a":
   status: maintained
@@ -3437,7 +3439,7 @@ West:
   files:
     - modules/trusted-firmware-a/
   labels:
-    - manifest-trusted-firmware-a
+    - "area: TF-A"
 
 "West project: psa-arch-tests":
   status: maintained
@@ -3448,7 +3450,7 @@ West:
     - SebastianBoe
   files: []
   labels:
-    - manifest-psa-arch-tests
+    - "area: TF-M"
 
 "West project: uoscore-uedhoc":
   status: maintained
@@ -3458,7 +3460,8 @@ West:
   files:
     - modules/uoscore-uedhoc/
   labels:
-    - manifest-uoscore-uedhoc
+    - "area: Networking"
+    - "area: Crypto / RNG"
 
 "West project: zcbor":
   status: maintained
@@ -3467,7 +3470,7 @@ West:
   files:
     - modules/zcbor/
   labels:
-    - manifest-zcbor
+    - "area: CBOR"
 
 "West project: zscilib":
   status: maintained
@@ -3475,7 +3478,7 @@ West:
     - microbuilder
   files: []
   labels:
-    - manifest-zscilib
+    - "area: Sensors"
 
 Xtensa arch:
   status: maintained