diff --git a/.github/labeler.yml b/.github/labeler.yml
index ccbeddf92e..324f3f0a86 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -72,165 +72,169 @@ Component:
 - changed-files:
   - any-glob-to-any-file: components/**
 
+RT-Smart:
+- changed-files:
+  - any-glob-to-any-file: components/lwp/**
+
 'component: lwp':
 - changed-files:
-  - any-glob-to-any-file: components/lwp**
+  - any-glob-to-any-file: components/lwp/**
 
 'component: dfsv1':
 - changed-files:
-  - any-glob-to-any-file: components/dfs_v1**
+  - any-glob-to-any-file: components/dfs_v1/**
 
 'component: dfsv2':
 - changed-files:
-  - any-glob-to-any-file: components/dfs_v2**
+  - any-glob-to-any-file: components/dfs_v2/**
 
 'component: net':
 - changed-files:
-  - any-glob-to-any-file: components/net**
+  - any-glob-to-any-file: components/net/**
 
 'component: net/at':
 - changed-files:
-  - any-glob-to-any-file: components/net/at**
+  - any-glob-to-any-file: components/net/at/**
 
 'component: net/lwip':
 - changed-files:
-  - any-glob-to-any-file: components/net/lwip**
+  - any-glob-to-any-file: components/net/lwip/**
 
 'component: net/netdev':
 - changed-files:
-  - any-glob-to-any-file: components/net/netdev**
+  - any-glob-to-any-file: components/net/netdev/**
 
 'component: net/sal':
 - changed-files:
-  - any-glob-to-any-file: components/net/sal**
+  - any-glob-to-any-file: components/net/sal/**
 
 'component: drivers':
 - changed-files:
-  - any-glob-to-any-file: components/drivers**
+  - any-glob-to-any-file: components/drivers/**
 
 'component: drivers/audio':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/audio**
+  - any-glob-to-any-file: components/drivers/audio/**
 
 'component: drivers/can':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/can**
+  - any-glob-to-any-file: components/drivers/can/**
 
 'component: drivers/clk':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/clk**
+  - any-glob-to-any-file: components/drivers/clk/**
 
 'component: drivers/core':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/core**
+  - any-glob-to-any-file: components/drivers/core/**
 
 'component: drivers/cputime':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/cputime**
+  - any-glob-to-any-file: components/drivers/cputime/**
 
 'component: drivers/graphic':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/graphic**
+  - any-glob-to-any-file: components/drivers/graphic/**
 
 'component: drivers/hwcrypto':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/hwcrypto**
+  - any-glob-to-any-file: components/drivers/hwcrypto/**
 
 'component: drivers/hwtimer':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/hwtimer**
+  - any-glob-to-any-file: components/drivers/hwtimer/**
 
 'component: drivers/i2c':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/i2c**
+  - any-glob-to-any-file: components/drivers/i2c/**
 
 'component: drivers/ipc':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/ipc**
+  - any-glob-to-any-file: components/drivers/ipc/**
 
 'component: drivers/ktime':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/ktime**
+  - any-glob-to-any-file: components/drivers/ktime/**
 
 'component: drivers/misc':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/misc**
+  - any-glob-to-any-file: components/drivers/misc/**
 
 'component: drivers/mtd':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/mtd**
+  - any-glob-to-any-file: components/drivers/mtd/**
 
 'component: drivers/ofw':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/ofw**
+  - any-glob-to-any-file: components/drivers/ofw/**
 
 'component: drivers/pci':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/pci**
+  - any-glob-to-any-file: components/drivers/pci/**
 
 'component: drivers/phy':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/phy**
+  - any-glob-to-any-file: components/drivers/phy/**
 
 'component: drivers/pic':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/pic**
+  - any-glob-to-any-file: components/drivers/pic/**
 
 'component: drivers/pinctrl':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/pinctrl**
+  - any-glob-to-any-file: components/drivers/pinctrl/**
 
 'component: drivers/pm':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/pm**
+  - any-glob-to-any-file: components/drivers/pm/**
 
 'component: drivers/rtc':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/rtc**
+  - any-glob-to-any-file: components/drivers/rtc/**
 
 'component: drivers/sdio':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/sdio**
+  - any-glob-to-any-file: components/drivers/sdio/**
 
 'component: drivers/sensor_v1':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/sensor/v1**
+  - any-glob-to-any-file: components/drivers/sensor/v1/**
 
 'component: drivers/sensor_v2':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/sensor/v2**
+  - any-glob-to-any-file: components/drivers/sensor/v2/**
 
 'component: drivers/serial':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/serial**
+  - any-glob-to-any-file: components/drivers/serial/**
 
 'component: drivers/spi':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/spi**
+  - any-glob-to-any-file: components/drivers/spi/**
 
 'component: drivers/touch':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/touch**
+  - any-glob-to-any-file: components/drivers/touch/**
 
 'component: drivers/usb':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/usb**
+  - any-glob-to-any-file: components/drivers/usb/**
 
 'component: drivers/virtio':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/virtio**
+  - any-glob-to-any-file: components/drivers/virtio/**
 
 'component: drivers/watchdog':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/watchdog**
+  - any-glob-to-any-file: components/drivers/watchdog/**
 
 'component: drivers/wlan':
 - changed-files:
-  - any-glob-to-any-file: components/drivers/wlan**
+  - any-glob-to-any-file: components/drivers/wlan/**
 
 'component: finsh':
 - changed-files:
-  - any-glob-to-any-file: components/finsh**
+  - any-glob-to-any-file: components/finsh/**
 
 libcpu:
 - changed-files: