diff --git a/gms_full.mk b/gms_full.mk
index fe08786..6d2467a 100644
--- a/gms_full.mk
+++ b/gms_full.mk
@@ -107,7 +107,6 @@ PRODUCT_PACKAGES += \
 endif
 
 PRODUCT_PACKAGES += \
-    AICorePrebuilt-aicore_20250130.00_RC01 \
     AdaptiveVPNPrebuilt-10435 \
     AmbientStreaming \
     AndroidAutoStubPrebuilt \
diff --git a/gms_full_tablet_wifionly.mk b/gms_full_tablet_wifionly.mk
index fbb9a82..adf7554 100644
--- a/gms_full_tablet_wifionly.mk
+++ b/gms_full_tablet_wifionly.mk
@@ -71,7 +71,6 @@ endif
 
 # product/priv-app
 PRODUCT_PACKAGES += \
-    AICorePrebuilt-aicore_20250130.00_RC01 \
     AdaptiveVPNPrebuilt-10435 \
     AmbientStreaming \
     BetterBugStub \
diff --git a/gms_mini.mk b/gms_mini.mk
index 7d16bd3..b76af05 100644
--- a/gms_mini.mk
+++ b/gms_mini.mk
@@ -60,7 +60,6 @@ endif
 
 # product/priv-app
 PRODUCT_PACKAGES += \
-    AICorePrebuilt-aicore_20250130.00_RC01 \
     AndroidAutoStubPrebuilt \
     BetterBugStub \
     CarrierLocation \
diff --git a/gms_pico.mk b/gms_pico.mk
index 6fceb57..34f0035 100644
--- a/gms_pico.mk
+++ b/gms_pico.mk
@@ -44,7 +44,6 @@ PRODUCT_PACKAGES += \
 
 # product/priv-app
 PRODUCT_PACKAGES += \
-    AICorePrebuilt-aicore_20250130.00_RC01 \
     AndroidAutoStubPrebuilt \
     BetterBugStub \
     ConfigUpdater \
diff --git a/product/blobs/product_blobs.mk b/product/blobs/product_blobs.mk
index 82dd284..80914d8 100644
--- a/product/blobs/product_blobs.mk
+++ b/product/blobs/product_blobs.mk
@@ -85,17 +85,6 @@ PRODUCT_PACKAGES += \
     pixel_experience_2020_midyear \
     pixel_experience_2020 \
     pixel_experience_2021_midyear \
-    pixel_experience_2021 \
-    pixel_experience_2022_midyear \
-    pixel_experience_2022 \
-    pixel_experience_2023_midyear \
-    pixel_experience_2023 \
-    pixel_experience_2024_midyear \
-    pixel_experience_2024 \
-    pixel_experience_2025_midyear \
-    pixel_experience_2025 \
-    pixel_experience_2026_midyear \
-    pixel_experience_2026 \
     preinstalled_packages_pixel_experience_2017_and_newer \
     preinstalled_packages_pixel_experience_2021_and_newer \
     preinstalled-packages-product-pixel-2017-and-newer \
@@ -106,6 +95,51 @@ PRODUCT_PACKAGES += \
     preinstalled-packages-product-pixel-2024-and-newer \
     spoon
 
+ifneq ($(filter oriole raven panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2021
+endif
+
+ifneq ($(filter bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2022_midyear
+endif
+
+ifneq ($(filter panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2022
+endif
+
+ifneq ($(filter lynx felix shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2023_midyear
+endif
+
+ifneq ($(filter shiba husky akita tokay caiman komodo comet tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2023
+endif
+
+ifneq ($(filter akita tokay caiman komodo comet tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2024_midyear
+endif
+
+ifneq ($(filter tokay caiman komodo comet tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2024
+endif
+
+ifneq ($(filter tegu frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2025_midyear
+endif
+
+ifneq ($(filter frankel blazer mustang rango, $(LINEAGE_BUILD)),)
+PRODUCT_PACKAGES += \
+    pixel_experience_2025
+endif
+
 ifneq ($(filter blueline crosshatch sargo bonito flame coral sunfish bramble redfin barbet oriole raven bluejay panther cheetah lynx tangorpro felix shiba husky akita tokay caiman komodo comet tegu, $(LINEAGE_BUILD)),)
 PRODUCT_PACKAGES += \
     GoogleCamera_6gb_or_more_ram \
diff --git a/product/packages/privileged_apps/AICorePrebuilt-aicore_20250130.00_RC01/AICorePrebuilt-aicore_20250130.00_RC01.apk b/product/packages/privileged_apps/AICorePrebuilt-aicore_20250130.00_RC01/AICorePrebuilt-aicore_20250130.00_RC01.apk
deleted file mode 100644
index 096be37..0000000
Binary files a/product/packages/privileged_apps/AICorePrebuilt-aicore_20250130.00_RC01/AICorePrebuilt-aicore_20250130.00_RC01.apk and /dev/null differ
diff --git a/product/packages/privileged_apps/AICorePrebuilt-aicore_20250130.00_RC01/Android.mk b/product/packages/privileged_apps/AICorePrebuilt-aicore_20250130.00_RC01/Android.mk
deleted file mode 100644
index 41d83c6..0000000
--- a/product/packages/privileged_apps/AICorePrebuilt-aicore_20250130.00_RC01/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2023 Raphielscape LLC.
-#
-# Licensed under the Apache License, Version 2.0 (the License);
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := AICorePrebuilt-aicore_20250130.00_RC01
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := AICorePrebuilt-aicore_20250130.00_RC01.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_CLASS := APPS
-LOCAL_PRODUCT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions androidx.window.sidecar
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-include $(BUILD_PREBUILT)
diff --git a/product/packages/privileged_apps/SCONE/Android.mk b/product/packages/privileged_apps/SCONE/Android.mk
index 872b12d..bd0965f 100644
--- a/product/packages/privileged_apps/SCONE/Android.mk
+++ b/product/packages/privileged_apps/SCONE/Android.mk
@@ -27,7 +27,7 @@ LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_MODULE_CLASS := APPS
 LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OPTIONAL_USES_LIBRARIES := android.telephony.satellite org.apache.http.legacy androidx.window.extensions androidx.window.sidecar
+LOCAL_OPTIONAL_USES_LIBRARIES := android.telephony.satellite org.apache.http.legacy wear-sdk androidx.window.extensions androidx.window.sidecar
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)
 
diff --git a/system/blobs/system_blobs.mk b/system/blobs/system_blobs.mk
index 539d210..f68bc59 100644
--- a/system/blobs/system_blobs.mk
+++ b/system/blobs/system_blobs.mk
@@ -22,4 +22,5 @@ PRODUCT_PACKAGES += \
     privapp_allowlist_com.google.android.ext.services
 
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
-    system/etc/permissions/privapp-permissions-google.xml
+    system/etc/permissions/privapp-permissions-google.xml \
+    system/etc/permissions/privapp_allowlist_com.google.android.ext.services.xml
diff --git a/system/packages/privileged_apps/GoogleExtServices/Android.mk b/system/packages/privileged_apps/GoogleExtServices/Android.mk
index e13ad2f..b6f48e9 100644
--- a/system/packages/privileged_apps/GoogleExtServices/Android.mk
+++ b/system/packages/privileged_apps/GoogleExtServices/Android.mk
@@ -25,6 +25,6 @@ LOCAL_SRC_FILES := GoogleExtServices.apk
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_CLASS := APPS
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := ExtServices com.android.extservices
+LOCAL_OVERRIDES_PACKAGES := ExtServices
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 include $(BUILD_PREBUILT)