diff --git a/files/ansible-playbooks/sot-updater.yml b/files/ansible-playbooks/sot-updater.yml
index fedb54c..209213c 100644
--- a/files/ansible-playbooks/sot-updater.yml
+++ b/files/ansible-playbooks/sot-updater.yml
@@ -205,9 +205,13 @@
         dev1_fw_clean: >-
           {{
             (
-              (dev1_banner.stdout | default('') | trim)
-              | regex_replace('[Rr][Ee][Vv]\\.?\\s*([0-9]+)', '-r\\1')
-              | regex_search('[0-9]+\\.[0-9]+\\.[0-9]+-r[0-9]+')
+              dev1_banner.stdout
+              | default('')
+              | trim
+              # 1. make sure “rev” becomes “-r”
+              | regex_replace('(?i)\\s*rev\\s*([0-9]+)', '-r\\1')
+              # 2. remove any junk after version block (like “| date …”)
+              | regex_replace('([0-9]+\\.[0-9]+\\.[0-9]+-r[0-9]+).*', '\\1')
             )
             | default('', true)
             | trim