diff --git a/.spacemacs b/.spacemacs
index 3bb5038..d8d8c0b 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -1353,14 +1353,20 @@ This function is called at the very end of Spacemacs initialization."
                                        ("Solaris/S11.4-SRU"
                                         . "tag:s11u4-sru and not (tag:on or tag:userland)")
                                        ("Solaris/S11.4-SRU/ON"
-                                        . "tag:s11u4-sru and tag:on and not (tag:logs or tag:pushlog)")
+                                        . "tag:s11u4-sru and tag:on and not (tag:logs or tag:pushlog or tag:webrti)")
                                        ("Solaris/S11.4-SRU/ON/logs"
-                                        . "tag:s11u4-sru and tag:on and (tag:logs or tag:pushlog)")
+                                        . "tag:s11u4-sru and tag:on and (tag:logs or tag:pushlog) and not tag:webrti")
+                                       ("Solaris/S11.4-SRU/ON/WebRTI"
+                                        . "tag:s11u4-sru and tag:on and tag:webrti")
                                        ("Solaris/S11.4-SRU/Userland"
-                                        . "tag:s11u4-sru and tag:userland and not (tag:logs or tag:pushlog)")
+                                        . "tag:s11u4-sru and tag:userland and not (tag:logs or tag:pushlog) and not tag:webrti")
                                        ("Solaris/S11.4-SRU/Userland/logs"
                                         . "tag:s11u4-sru and tag:userland and (tag:logs or tag:pushlog)")
-                                       ("Solaris/Trunk" . "tag:trunk")
+                                       ("Solaris/S11.4-SRU/Userland/WebRTI"
+                                        . "tag:s11u4-sru and tag:userland and tag:webrti")
+                                       ("Solaris/Trunk" . "tag:trunk and not (tag:logs or tag:webrti or tag:pushlog or tag:jenkins)")
+                                       ("Solaris/Trunk/Logs" . "tag:trunk and (tag:logs or tag:pushlog or tag:jenkins)")
+                                       ("Solaris/Trunk/WebRTI" . "tag:trunk and tag:webrti")
                                        ("Solaris/S11.3-SRU"
                                         . "tag:s11u3-sru")
                                        ("Solaris/GKAP"