diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index 771d5868..a62d5d55 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -255,7 +255,7 @@ if depsonly:
 else:
     for repository in repositories:
         repo_name = repository['name']
-        if repo_name.startswith("android_device_") and repo_name.endswith("_" + device):
+        if re.match(r"^android_device_[^_]*_" + device + "$", repo_name):
             print("Found repository: %s" % repository['name'])
             
             manufacturer = repo_name.replace("android_device_", "").replace("_" + device, "")