diff --git a/build-community.sh b/build-community.sh
index efa019effc13760b11810939468873aa6df56d16..e5feb4d58ff031956fcd935c9e465a5b0cbe5437 100755
--- a/build-community.sh
+++ b/build-community.sh
@@ -126,6 +126,9 @@ for branch in ${BRANCH_NAME//,/ }; do
       elif [[ $branch =~ pie$ ]]; then
         themuppets_branch=lineage-16.0
         echo ">> [$(date)] Use branch $themuppets_branch on github.com/TheMuppets"
+      elif [[ $branch =~ q$ ]]; then
+        themuppets_branch=lineage-17.1
+        echo ">> [$(date)] Use branch $themuppets_branch on github.com/TheMuppets"
       else
         themuppets_branch=cm-14.1
         echo ">> [$(date)] Can't find a matching branch on github.com/TheMuppets, using $themuppets_branch"
diff --git a/src/build.sh b/src/build.sh
index 6d5ccfb3860f2f9fed6c94e81ee133e8ac92fc7e..3ce4622a8c0e14678ee33f8a995928432b00831c 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -81,6 +81,9 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
     elif [[ ${BRANCH_NAME} =~ pie$ ]]; then
       themuppets_branch=lineage-16.0
       echo ">> [$(date)] Use branch $themuppets_branch on github.com/TheMuppets"
+    elif [[ ${BRANCH_NAME} =~ q$ ]]; then
+      themuppets_branch=lineage-17.1
+      echo ">> [$(date)] Use branch $themuppets_branch on github.com/TheMuppets"
     else
       themuppets_branch=cm-14.1
       echo ">> [$(date)] Can't find a matching branch on github.com/TheMuppets, using $themuppets_branch"
@@ -96,14 +99,17 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
     sync_successful=false
   fi
 
-  android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.OPM1 := //p' build/core/version_defaults.mk)
+  android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.QP1A := //p' build/core/version_defaults.mk)
   if [ -z $android_version ]; then
-    android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.PPR1 := //p' build/core/version_defaults.mk)
+    android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.OPM1 := //p' build/core/version_defaults.mk)
     if [ -z $android_version ]; then
-      android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION := //p' build/core/version_defaults.mk)
+      android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION\.PPR1 := //p' build/core/version_defaults.mk)
       if [ -z $android_version ]; then
-        echo ">> [$(date)] Can't detect the android version"
-        exit 1
+        android_version=$(sed -n -e 's/^\s*PLATFORM_VERSION := //p' build/core/version_defaults.mk)
+        if [ -z $android_version ]; then
+          echo ">> [$(date)] Can't detect the android version"
+          exit 1
+        fi
       fi
     fi
   fi