diff --git a/rp_reporter/rp_reporter/batch_reporter.py b/rp_reporter/rp_reporter/batch_reporter.py
index 30399e6..1a92ddc 100755
--- a/rp_reporter/rp_reporter/batch_reporter.py
+++ b/rp_reporter/rp_reporter/batch_reporter.py
@@ -9,6 +9,7 @@
 import logging
 import yaml
 import uuid
+import re
 
 from collections import deque
 from time import sleep
@@ -109,14 +110,8 @@
         tags["openstack"] = context_name.split("/")[0]
         tags["context"] = context_name.split("/")[-1]
 
-    if "mosk-24.3" in job.name:
-        tags["mosk_version"] = "mosk-24.3"
-    elif "mosk-25.1" in job.name:
-        tags["mosk_version"] = "mosk-25.1"
-    elif "mosk-25.2" in job.name:
-        tags["mosk_version"] = "mosk-25.2"
-    else:
-        tags["mosk_version"] = "master"
+    mosk_versions = re.findall(r'mosk-(\d+\.\d+)', job.name)
+    tags["mosk_version"] = f"mosk-{mosk_versions[0]}" if mosk_versions else "master"
 
     return tags