diff --git a/config/common.mk b/config/common.mk
index f175568..69df85a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -91,24 +91,17 @@ PRODUCT_PACKAGES += \
 # ---------------------------------------------------------------------------
 PRODUCT_PACKAGES += \
     Updater \
-    PawletSetupWizard \
-    BgUpd
+    BgUpd \
+    PawletSetupWizard
 
 # bg-upd's own sepolicy domain — lives in its own repo (packages/apps/BgUpd/sepolicy),
 # included unconditionally since it's a core PawletOS system app, not an optional one.
 BOARD_SEPOLICY_DIRS += packages/apps/BgUpd/sepolicy
 
 # ---------------------------------------------------------------------------
-# Day-one default WebView provider (com.android.webview / "chromium"), so the
-# device boots with a working WebView before bg-upd's first check ever runs.
-# This is LineageOS's chromium-webview prebuilt, already pulled in by
-# android_local_manifest/common/vendor/lineageos.xml (external/chromium-webview,
-# module "webview" from its os_pickup.bp). bg-upd manages every other provider
-# (Bromite, Google) purely at runtime afterwards — see
-# vendor/pawlet/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml.
+# MicroG — open-source Google Play Services replacement
 # ---------------------------------------------------------------------------
-PRODUCT_PACKAGES += \
-    webview
+$(call inherit-product, vendor/pawlet/config/microg.mk)
 
 # ---------------------------------------------------------------------------
 # PawletOS build-time framework resource overlay (adds new drawables)
diff --git a/config/microg.mk b/config/microg.mk
index c6585bb..48b3947 100644
--- a/config/microg.mk
+++ b/config/microg.mk
@@ -4,8 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # MicroG product config.
-# Uncomment the vendor/partner_gms entry in android_local_manifest/pawletos.xml
-# before enabling this, then include from rpi_common.mk or a device .mk:
+# Include from rpi_common.mk or a device .mk:
 #   $(call inherit-product, vendor/pawlet/config/microg.mk)
 #
 
diff --git a/config/rpi_common.mk b/config/rpi_common.mk
index 0b36b9a..9501ec4 100644
--- a/config/rpi_common.mk
+++ b/config/rpi_common.mk
@@ -9,11 +9,6 @@
 #   $(call inherit-product, vendor/pawlet/config/rpi_common.mk)
 #
 
-# ---------------------------------------------------------------------------
-# MicroG — open-source Google Play Services replacement
-# ---------------------------------------------------------------------------
-$(call inherit-product, vendor/pawlet/config/microg.mk)
-
 # ---------------------------------------------------------------------------
 # Base hardware and software feature declarations for all RPi devices
 # ---------------------------------------------------------------------------
diff --git a/config/version.mk b/config/version.mk
index de655f3..7e3607d 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -50,8 +50,8 @@ PAWLET_DISPLAY_VERSION := $(PAWLET_MAJOR_VERSION)-$(PAWLET_VERSION_SUFFIX)
 # something CI infers automatically. See PawletOS-Build/docs/security-patch-process.md
 # and PawletOS-Build/scripts/check_security_patch.py (run the latter to see
 # how far behind this date is against the latest published AOSP bulletin).
-PAWLET_SECURITY_PATCH := 2026-07-05
-PLATFORM_SECURITY_PATCH := $(PAWLET_SECURITY_PATCH)
+#PAWLET_SECURITY_PATCH := 2026-07-05
+#PLATFORM_SECURITY_PATCH := $(PAWLET_SECURITY_PATCH)
 
 # ---------------------------------------------------------------------------
 # System properties written into /product/build.prop