diff --git a/jenkins_jobs/registry.py b/jenkins_jobs/registry.py
index a81f1a342..739c8f3a0 100644
--- a/jenkins_jobs/registry.py
+++ b/jenkins_jobs/registry.py
@@ -64,7 +64,7 @@ class ModuleRegistry(object):
             mapped to its plugin info dictionary.
             """
             version = plugin_info.get('version', '0')
-            plugin_info['version'] = re.sub(r'(.*)-(?:SNAPSHOT|BETA)',
+            plugin_info['version'] = re.sub(r'(.*)-(?:SNAPSHOT|BETA).*',
                                             r'\g<1>.preview', version)
 
             aliases = []
diff --git a/tests/moduleregistry/test_moduleregistry.py b/tests/moduleregistry/test_moduleregistry.py
index a0408f898..0b0c54a45 100644
--- a/tests/moduleregistry/test_moduleregistry.py
+++ b/tests/moduleregistry/test_moduleregistry.py
@@ -24,6 +24,10 @@ class ModuleRegistryPluginInfoTestsWithScenarios(
         ('s11', dict(v1='1.0.preview', op='__lt__', v2='1.0')),
         ('s12', dict(v1='1.1-SNAPSHOT', op='__gt__', v2='1.0')),
         ('s13', dict(v1='1.0a-SNAPSHOT', op='__lt__', v2='1.0a')),
+        ('s14', dict(v1='1.4.6-SNAPSHOT (private-0986edd9-example)',
+                     op='__lt__', v2='1.4.6')),
+        ('s15', dict(v1='1.4.6-SNAPSHOT (private-0986edd9-example)',
+                     op='__gt__', v2='1.4.5')),
     ]
 
     def setUp(self):