diff --git a/build-community.sh b/build-community.sh
index 1b4ac01ee6337bf5d72dbe176f7ef7f584e4e7d6..0f679b55c2d011ff9c9348643efdb1a59b21d6ec 100755
--- a/build-community.sh
+++ b/build-community.sh
@@ -120,6 +120,9 @@ for branch in ${BRANCH_NAME//,/ }; do
     elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then
       themuppets_branch="lineage-21.0"
       android_version="14"
+    elif [[ "${BRANCH_NAME}" =~ $regex_part1"a15"$regex_part2 || "${BRANCH_NAME}" =~ "a15" ]]; then
+      themuppets_branch="lineage-22.1"
+      android_version="15"
     else
       echo ">> [$(date)] Building branch $branch is not (yet) suppported"
       exit 1
@@ -146,23 +149,26 @@ for branch in ${BRANCH_NAME//,/ }; do
     echo ">> [$(date)] (Re)initializing branch repository" | tee -a "$repo_log"
 
     if [ "$LOCAL_MIRROR" = true ]; then
-        repo_cmd="yes | repo init -u \"$REPO\" --reference \"$MIRROR_DIR\" -b \"$branch\""
+      repo_cmd="yes | repo init -u \"$REPO\" --reference \"$MIRROR_DIR\" -b \"$branch\""
     else
-        TAG_PREFIX=""
+      TAG_PREFIX=""
 
-        # Fetch all tags and check for an exact match
-        TAG_MATCH=$(curl -s --fail https://gitlab.e.foundation/api/v4/projects/659/repository/tags?search=${BRANCH_NAME} | jq -r ".[].name" | grep -Fx "${BRANCH_NAME}")
+      # Fetch all tags and check for an exact match
+      TAG_MATCH=$(curl -s --fail https://gitlab.e.foundation/api/v4/projects/659/repository/tags?search=${BRANCH_NAME} | jq -r ".[].name" | grep -Fx "${BRANCH_NAME}")
 
-        if [ -n "$TAG_MATCH" ]; then
-            echo ">> [$(date)] Branch name $branch is a tag on e/os/releases, prefixing with refs/tags/ for 'repo init'" | tee -a "$repo_log"
-            TAG_PREFIX="refs/tags/"
-        fi
+      if [ -n "$TAG_MATCH" ]; then
+        echo ">> [$(date)] Branch name $branch is a tag on e/os/releases, prefixing with refs/tags/ for 'repo init'" | tee -a "$repo_log"
+        TAG_PREFIX="refs/tags/"
+      fi
 
-        repo_cmd="yes | repo init -u \"$REPO\" -b \"${TAG_PREFIX}$branch\""
+      repo_cmd="yes | repo init -u \"$REPO\" -b \"${TAG_PREFIX}$branch\""
     fi
 
     echo ">> [$(date)] Running: $repo_cmd" | tee -a "$repo_log"
-    eval "$repo_cmd" &>>"$repo_log" || { echo ">> [$(date)] ERROR: Failed to initialize repository" | tee -a "$repo_log"; exit 1; }
+    eval "$repo_cmd" &>>"$repo_log" || {
+      echo ">> [$(date)] ERROR: Failed to initialize repository" | tee -a "$repo_log"
+      exit 1
+    }
 
     # Copy local manifests to the appropriate folder in order take them into consideration
     echo ">> [$(date)] Copying '$LMANIFEST_DIR/*.xml' to '.repo/local_manifests/'"
diff --git a/src/apex.list b/src/apex.list
index 65a8672362ac54d850a194dc0af44d70fa5d44ca..bf13f934346f9553e3ca73c904e6df884b2eaca1 100644
--- a/src/apex.list
+++ b/src/apex.list
@@ -2,6 +2,7 @@ com.android.adbd
 com.android.adservices
 com.android.adservices.api
 com.android.appsearch
+com.android.appsearch.apk
 com.android.art
 com.android.bluetooth
 com.android.btservices
@@ -13,9 +14,13 @@ com.android.conscrypt
 com.android.devicelock
 com.android.extservices
 com.android.graphics.pdf
+com.android.hardware.authsecret
 com.android.hardware.biometrics.face.virtual
 com.android.hardware.biometrics.fingerprint.virtual
+com.android.hardware.boot
 com.android.hardware.cas
+com.android.hardware.neuralnetworks
+com.android.hardware.rebootescrow
 com.android.hardware.wifi
 com.android.healthfitness
 com.android.hotspot2.osulogin
@@ -27,9 +32,11 @@ com.android.mediaprovider
 com.android.nearby.halfsheet
 com.android.networkstack.tethering
 com.android.neuralnetworks
+com.android.nfcservices
 com.android.ondevicepersonalization
 com.android.os.statsd
 com.android.permission
+com.android.profiling
 com.android.resolv
 com.android.rkpd
 com.android.runtime
diff --git a/src/apex_apk.list b/src/apex_apk.list
index a770e69f62b326aba7f04167cec60971f53d28ed..f5cb6fc53a45606d87870e2644d30d77d88fd57c 100644
--- a/src/apex_apk.list
+++ b/src/apex_apk.list
@@ -1,5 +1,8 @@
 AdServicesApk
+FederatedCompute
 HalfSheetUX
+HealthConnectBackupRestore
+HealthConnectController
 OsuLogin
 SafetyCenterResources
 ServiceConnectivityResources
diff --git a/src/build.sh b/src/build.sh
index eca2ccbec4a5e5982e8bfc4b8a8951699da7192b..8e7289b7a3dc3227c681d4cf633f85ce015cf41e 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -91,7 +91,7 @@ exit_script() {
 sync_successful=true
 
 use_openjdk_from_ubuntu=false
-branch_dir=$(sed -E 's/^v[0-9](\.[0-9]*){0,2}(-(beta|alpha|rc)(\.[0-9]*){0,1}){0,1}-(nougat|oreo|pie|q|r|s|t|u|a14)(-[a-zA-Z0-9_]*)*$/\5/' <<<"${BRANCH_NAME}")
+branch_dir=$(sed -E 's/^v[0-9](\.[0-9]*){0,2}(-(beta|alpha|rc)(\.[0-9]*){0,1}){0,1}-(nougat|oreo|pie|q|r|s|t|u|a14|a15)(-[a-zA-Z0-9_]*)*$/\5/' <<<"${BRANCH_NAME}")
 branch_dir=${branch_dir^^}
 
 if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
@@ -126,11 +126,14 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
     themuppets_branch="lineage-21.0"
     android_version="14"
   elif [[ "${BRANCH_NAME}" =~ $regex_part1"a14"$regex_part2 || "${BRANCH_NAME}" =~ "a14" ]]; then
-      themuppets_branch="lineage-21.0"
-      android_version="14"
+    themuppets_branch="lineage-21.0"
+    android_version="14"
+  elif [[ "${BRANCH_NAME}" =~ $regex_part1"a15"$regex_part2 || "${BRANCH_NAME}" =~ "a15" ]]; then
+    themuppets_branch="lineage-22.1"
+    android_version="15"
   else
-      echo ">> [$(date)] Building branch $BRANCH_NAME is not (yet) supported"
-      exit 1
+    echo ">> [$(date)] Building branch $BRANCH_NAME is not (yet) supported"
+    exit 1
   fi
 
   if [[ "${KEEP_LOCAL_MANIFEST_BRANCH}" = true ]]; then
@@ -168,8 +171,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
   TAG_MATCH=$(curl -s --fail https://gitlab.e.foundation/api/v4/projects/659/repository/tags | jq -r ".[].name" | grep -Fx "$BRANCH_NAME")
 
   if [ -n "$TAG_MATCH" ]; then
-      echo ">> [$(date)] Branch name $BRANCH_NAME is a tag on e/os/releases, prefixing with refs/tags/ for 'repo init'"
-      TAG_PREFIX="refs/tags/"
+    echo ">> [$(date)] Branch name $BRANCH_NAME is a tag on e/os/releases, prefixing with refs/tags/ for 'repo init'"
+    TAG_PREFIX="refs/tags/"
   fi
 
   if [ -n ${REPO_INIT_DEPTH} ] && [ ${REPO_INIT_DEPTH} -gt 0 ]; then
@@ -380,7 +383,7 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
           build_success=true
         fi
       fi
-    elif [ "$android_version_major" -lt "12" ]; then
+    elif [ "$android_version_major" -lt "12" ] || [ "${RELEASE_TYPE}" = "test" ]; then
       if [ "${BUILD_SUPER_IMAGE}" = true ]; then
         if breakfast_device && mka bacon superimage; then
           build_success=true
@@ -496,10 +499,10 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then
 
         if [ ! -d "$IMG_FIRMWARE_PATH" ]; then
           # If it doesn't exist, use an alternative path, used in lineage-21
-          IMG_FIRMWARE_VENDOR_PATH=$(repo list | grep "proprietary_vendor_.*_${DEVICE}" | cut  -d : -f 1 | xargs)
-          if [ -n "$IMG_FIRMWARE_VENDOR_PATH" ] &&  [ -d "$source_dir/$IMG_FIRMWARE_VENDOR_PATH" ]; then
-             IMG_FIRMWARE_PATH="$source_dir/$IMG_FIRMWARE_VENDOR_PATH/radio"
-             echo ">> INFO: \$IMG_FIRMWARE_PATH: $IMG_FIRMWARE_PATH"
+          IMG_FIRMWARE_VENDOR_PATH=$(repo list | grep "proprietary_vendor_.*_${DEVICE}" | cut -d : -f 1 | xargs)
+          if [ -n "$IMG_FIRMWARE_VENDOR_PATH" ] && [ -d "$source_dir/$IMG_FIRMWARE_VENDOR_PATH" ]; then
+            IMG_FIRMWARE_PATH="$source_dir/$IMG_FIRMWARE_VENDOR_PATH/radio"
+            echo ">> INFO: \$IMG_FIRMWARE_PATH: $IMG_FIRMWARE_PATH"
           fi
         fi