diff --git a/build-community.sh b/build-community.sh
index f6c41c35a582e7b1a41fd7775254be99c1f7c941..5616c79b28e8609b68792b32208ae30de551dcc7 100755
--- a/build-community.sh
+++ b/build-community.sh
@@ -84,32 +84,32 @@ for branch in ${BRANCH_NAME//,/ }; do
   if [ -n "$branch" ] && [ -n "$devices" ]; then
     vendor=lineage
     case "$branch" in
-      *nougat*)
+      v*-nougat*)
         vendor="cm"
         themuppets_branch="cm-14.1"
         android_version="7.1.2"
         ;;
-      *oreo*)
+      v*-oreo*)
         themuppets_branch="lineage-15.1"
         android_version="8.1"
         ;;
-      *pie*)
+      v*-pie*)
         themuppets_branch="lineage-16.0"
         android_version="9"
         ;;
-      *q*)
+      v*-q*)
         themuppets_branch="lineage-17.1"
         android_version="10"
         ;;
-      *r*)
+      v*-r*)
         themuppets_branch="lineage-18.1"
         android_version="11"
         ;;
-      *s*)
+      v*-s*)
         themuppets_branch="lineage-19.1"
         android_version="12"
         ;;
-      *t*)
+      v*-t*)
         themuppets_branch="lineage-20.0"
         android_version="13"
         ;;
diff --git a/src/build.sh b/src/build.sh
index ca2ee1cd48352d53a93d6da4d7a454b740748dc0..92cd0538e967f8db0689ae6b122c2bcd0b6af086 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -40,34 +40,34 @@ branch_dir=${branch_dir^^}
 if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
   vendor=lineage
   case "$BRANCH_NAME" in
-    *nougat*)
+    v*-nougat*)
       vendor="cm"
       themuppets_branch="cm-14.1"
       android_version="7.1.2"
       use_openjdk_from_ubuntu=true
       ;;
-    *oreo*)
+    v*-oreo*)
       themuppets_branch="lineage-15.1"
       android_version="8.1"
       use_openjdk_from_ubuntu=true
       ;;
-    *pie*)
+    v*-pie*)
       themuppets_branch="lineage-16.0"
       android_version="9"
       ;;
-    *q*)
+    v*-q*)
       themuppets_branch="lineage-17.1"
       android_version="10"
       ;;
-    *r*)
+    v*-r*)
       themuppets_branch="lineage-18.1"
       android_version="11"
       ;;
-    *s*)
+    v*-s*)
       themuppets_branch="lineage-19.1"
       android_version="12"
       ;;
-    *t*)
+    v*-t*)
       themuppets_branch="lineage-20.0"
       android_version="13"
       ;;