diff --git a/config/common.mk b/config/common.mk
index 3eea8583..f215443c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -74,6 +74,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     frameworks/base/data/keyboards/Vendor_045e_Product_028e.kl:$(TARGET_COPY_OUT_PRODUCT)/usr/keylayout/Vendor_045e_Product_0719.kl
 
+# Component overrides
+PRODUCT_PACKAGES += \
+    lineage-component-overrides.xml
+
 # This is Lineage!
 PRODUCT_COPY_FILES += \
     vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/org.lineageos.android.xml
diff --git a/overlay/common/lineage-sdk/lineage/res/res/values/config.xml b/overlay/common/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index 7341671d..00000000
--- a/overlay/common/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod Project
-                   2017-2022 The LineageOS Project
-
-     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.
--->
-<resources>
-    <!-- The list of components which should be automatically disabled for all devices. -->
-    <string-array name="config_globallyDisabledComponents" translatable="false">
-        <!-- Disable stock OTA components if installed -->
-        <item>com.android.vending/com.google.android.finsky.systemupdate.SystemUpdateSettingsContentProvider</item>
-        <item>com.android.vending/com.google.android.finsky.systemupdateactivity.SettingsSecurityEntryPoint</item>
-        <item>com.android.vending/com.google.android.finsky.systemupdateactivity.SystemUpdateActivity</item>
-        <item>com.google.android.gms/com.google.android.gms.update.phone.PopupDialog</item>
-        <item>com.google.android.gms/com.google.android.gms.update.OtaSuggestionActivity</item>
-        <item>com.google.android.gms/com.google.android.gms.update.OtaSuggestionSummaryProvider</item>
-        <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateActivity</item>
-        <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateGcmTaskService</item>
-        <item>com.google.android.gms/com.google.android.gms.update.SystemUpdatePersistentListenerService</item>
-        <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
-        <item>com.google.android.setupwizard/com.google.android.setupwizard.update.OtaUpdateActivity</item>
-    </string-array>
-</resources>
diff --git a/prebuilt/common/Android.bp b/prebuilt/common/Android.bp
index 3985af01..bd21f393 100644
--- a/prebuilt/common/Android.bp
+++ b/prebuilt/common/Android.bp
@@ -11,3 +11,10 @@ prebuilt_etc_xml {
     src: "etc/sensitive_pn.xml",
     schema: ":spn-schema",
 }
+
+prebuilt_etc_xml {
+    name: "lineage-component-overrides.xml",
+    product_specific: true,
+    src: "etc/lineage-component-overrides.xml",
+    sub_dir: "sysconfig",
+}
diff --git a/prebuilt/common/etc/lineage-component-overrides.xml b/prebuilt/common/etc/lineage-component-overrides.xml
new file mode 100644
index 00000000..be67c171
--- /dev/null
+++ b/prebuilt/common/etc/lineage-component-overrides.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2024 The LineageOS Project
+
+     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.
+-->
+<config>
+    <component-override package="com.android.vending">
+        <component class=".systemupdateactivity.SettingsSecurityEntryPoint" enabled="false" />
+        <component class=".systemupdateactivity.SystemUpdateActivity" enabled="false" />
+        <component class=".systemupdate.SystemUpdateSettingsContentProvider" enabled="false" />
+    </component-override>
+
+    <component-override package="com.google.android.gms">
+        <component class=".update.OtaSuggestionActivity" enabled="false" />
+        <component class=".update.OtaSuggestionSummaryProvider" enabled="false" />
+        <component class=".update.phone.PopupDialog" enabled="false" />
+        <component class=".update.SystemUpdateActivity" enabled="false" />
+        <component class=".update.SystemUpdateGcmTaskService" enabled="false" />
+        <component class=".update.SystemUpdatePersistentListenerService" enabled="false" />
+        <component class=".update.SystemUpdateService" enabled="false" />
+    </component-override>
+
+    <component-override package="com.google.android.setupwizard">
+        <component class=".update.OtaUpdateActivity" enabled="false" />
+    </component-override>
+</config>