diff --git a/bin/retag-email b/bin/retag-email
index 15d47e9..e269ca8 100755
--- a/bin/retag-email
+++ b/bin/retag-email
@@ -68,7 +68,7 @@ notmuch tag +s11.3-sru +userland \
         tag: phabricator AND \
         'subject:/\[Diffusion\].*rUSERLAND.*11\.3/'
 
-notmuch tag +s11.4-sru +userland \
+notmuch tag +s11u4-sru +userland \
         tag:phabricator AND \
         'subject:/\[Diffusion\].*rUSERLAND.*11\.4/'
 
@@ -119,10 +119,11 @@ notmuch tag +on tag:webrti AND body:"/Consolidation.*on"
 notmuch tag +s11.3-sru tag:webrti AND tag:on AND body:"Gates:.*S11.SRU.Sustaining"
 
 
-notmuch tag +s11.4-sru +logs +on \
+notmuch tag +s11u4-sru +logs +on \
         'from:/root@sig-on-sru11-3-[xs]01/'
 notmuch tag +s11u4-sru tag:webrti AND tag:on AND body:"Gates:.*11.4-SRU"
-notmuch tag +on +pushlog subject:"/export.on-gate\/.*push/"
+notmuch tag +on +pushlog subject:"/export.on-gate.*push/"
+
 notmuch tag +on +trunk \
         to:'gk@hubbins' OR to:'gatekeeper@hubbins' OR to:'hg@hubbins' OR \
         from:'gatekeeper@hubbins'
@@ -236,7 +237,7 @@ notmuch tag +akidr \
         tag:RE AND \
         'subject:/.*Tracker.FYI.*IDR.*state.change/'
 
-notmuch tag +RE +s11.4-sru \
+notmuch tag +RE s11u4-sru \
         subject:'[Differential]' and body:'Repository rRETRUNK Release Engineering Trunk Gate'