diff --git a/samples/portability/cmsis_rtos_v1/philosophers/sample.yaml b/samples/portability/cmsis_rtos_v1/philosophers/sample.yaml
index 21eac5c7ee7..0ff0acbdadd 100644
--- a/samples/portability/cmsis_rtos_v1/philosophers/sample.yaml
+++ b/samples/portability/cmsis_rtos_v1/philosophers/sample.yaml
@@ -2,7 +2,7 @@ sample:
   name: CMSIS_RTOS_V1 Dining Philosophers
 common:
   extra_args: "-DDEBUG_PRINTF=1"
-  tags: cmsis_rtos_v1_philosopher
+  tags: cmsis_rtos
   min_ram: 32
   min_flash: 34
   platform_exclude: qemu_xtensa qemu_x86_64
@@ -16,9 +16,9 @@ common:
       - ".*THINKING.*"
       - ".*EATING.*"
 tests:
-  sample.philosopher:
-    tags: cmsis_rtos_v1_philosopher
-  sample.philosopher.same_prio:
+  sample.portability.cmsis_rtos_v1.philosopher:
+    tags: cmsis_rtos
+  sample.portability.cmsis_rtos_v1.philosopher.same_prio:
     extra_args: "-DSAME_PRIO=1"
-  sample.philosopher.semaphores:
+  sample.portability.cmsis_rtos_v1.philosopher.semaphores:
     extra_args: "-DFORKS=SEMAPHORES"
diff --git a/samples/portability/cmsis_rtos_v1/timer_synchronization/sample.yaml b/samples/portability/cmsis_rtos_v1/timer_synchronization/sample.yaml
index e4029030027..bf42f21ceb5 100644
--- a/samples/portability/cmsis_rtos_v1/timer_synchronization/sample.yaml
+++ b/samples/portability/cmsis_rtos_v1/timer_synchronization/sample.yaml
@@ -2,7 +2,7 @@ sample:
   name: CMSIS_RTOS_V1 Synchronization
 tests:
   sample.portability.cmsis_rtos_v1.timer_synchronization:
-    tags: cmsis_rtos_v1_synchronization
+    tags: cmsis_rtos
     min_ram: 32
     min_flash: 34
     harness: console
diff --git a/samples/portability/cmsis_rtos_v2/philosophers/sample.yaml b/samples/portability/cmsis_rtos_v2/philosophers/sample.yaml
index 8154ddf5baf..a773cf62e22 100644
--- a/samples/portability/cmsis_rtos_v2/philosophers/sample.yaml
+++ b/samples/portability/cmsis_rtos_v2/philosophers/sample.yaml
@@ -2,7 +2,7 @@ sample:
   name: CMSIS_RTOS_V2 Dining Philosophers
 common:
   extra_args: "-DDEBUG_PRINTF=1"
-  tags: cmsis_rtos_v2_philosopher
+  tags: cmsis_rtos
   min_ram: 32
   min_flash: 34
   platform_exclude: qemu_xtensa qemu_x86_64
@@ -16,9 +16,9 @@ common:
       - ".*THINKING.*"
       - ".*EATING.*"
 tests:
-  sample.philosopher:
-    tags: cmsis_rtos_v2_philosopher
-  sample.philosopher.same_prio:
+  sample.portability.cmsis_rtos_v2.philosopher:
+    tags: cmsis_rtos
+  sample.portability.cmsis_rtos_v2.philosopher.same_prio:
     extra_args: "-DSAME_PRIO=1"
-  sample.philosopher.semaphores:
+  sample.portability.cmsis_rtos_v2.philosopher.semaphores:
     extra_args: "-DFORKS=SEMAPHORES"
diff --git a/samples/portability/cmsis_rtos_v2/timer_synchronization/sample.yaml b/samples/portability/cmsis_rtos_v2/timer_synchronization/sample.yaml
index b92074e729b..c98ebac009f 100644
--- a/samples/portability/cmsis_rtos_v2/timer_synchronization/sample.yaml
+++ b/samples/portability/cmsis_rtos_v2/timer_synchronization/sample.yaml
@@ -2,7 +2,7 @@ sample:
   name: CMSIS_RTOS_V2 Synchronization
 tests:
   sample.portability.cmsis_rtos_v2.timer_synchronization:
-    tags: cmsis_rtos_v2_synchronization
+    tags: cmsis_rtos
     min_ram: 32
     min_flash: 34
     harness: console
diff --git a/tests/portability/cmsis_rtos_v1/testcase.yaml b/tests/portability/cmsis_rtos_v1/testcase.yaml
index 200e41a808e..0f35ec03521 100644
--- a/tests/portability/cmsis_rtos_v1/testcase.yaml
+++ b/tests/portability/cmsis_rtos_v1/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
   portability.cmsis_rtos_v1:
-    tags: cmsis_rtos_v1
+    tags: cmsis_rtos
     min_ram: 32
     min_flash: 34
diff --git a/tests/portability/cmsis_rtos_v2/testcase.yaml b/tests/portability/cmsis_rtos_v2/testcase.yaml
index a74924865d8..0f61803198e 100644
--- a/tests/portability/cmsis_rtos_v2/testcase.yaml
+++ b/tests/portability/cmsis_rtos_v2/testcase.yaml
@@ -1,6 +1,6 @@
 tests:
   portability.cmsis_rtos_v2:
     platform_exclude: qemu_x86_64 m2gl025_miv
-    tags: cmsis_rtos_v2
+    tags: cmsis_rtos
     min_ram: 32
     min_flash: 34