diff --git a/common.mk b/common.mk
index a87e438..01564dd 100644
--- a/common.mk
+++ b/common.mk
@@ -22,9 +22,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)
 $(call inherit-product, hardware/qcom-caf/common/common.mk)
 
 # Overlays
-DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay-lineage
-
 PRODUCT_ENFORCE_RRO_TARGETS := *
 
 PRODUCT_PACKAGES += \
@@ -32,8 +29,11 @@ PRODUCT_PACKAGES += \
     FrameworksResProduct \
     FrameworksResTarget \
     LineageApertureAppCommon \
+    LineageSdkOverlayCommon \
+    LineageSettingsProviderOverlayCommon \
     NcmTetheringOverlay \
     SettingsProviderResCommon \
+    SettingsResCommon \
     SystemUIResCommon \
     TelephonyResCommon \
     TelephonyResProduct \
diff --git a/resource-overlay/common/LineageSdkOverlay/Android.bp b/resource-overlay/common/LineageSdkOverlay/Android.bp
new file mode 100644
index 0000000..3671e93
--- /dev/null
+++ b/resource-overlay/common/LineageSdkOverlay/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "LineageSdkOverlayCommon",
+    vendor: true,
+}
diff --git a/resource-overlay/common/LineageSdkOverlay/AndroidManifest.xml b/resource-overlay/common/LineageSdkOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..ac40e93
--- /dev/null
+++ b/resource-overlay/common/LineageSdkOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="lineageos.platform.overlay.common">
+    <overlay android:targetPackage="lineageos.platform"
+             android:isStatic="true"
+             android:priority="0" />
+</manifest>
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/resource-overlay/common/LineageSdkOverlay/res/values/config.xml
similarity index 65%
rename from overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
rename to resource-overlay/common/LineageSdkOverlay/res/values/config.xml
index 8f10cf8..da51e5f 100644
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ b/resource-overlay/common/LineageSdkOverlay/res/values/config.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2015 The CyanogenMod Project
      SPDX-FileCopyrightText: The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
 <resources>
-    <!-- Whether device has screen with higher aspect ratio -->
+    <!-- Whether device has a screen with a higher aspect ratio -->
     <bool name="config_haveHigherAspectRatioScreen">true</bool>
 </resources>
diff --git a/resource-overlay/common/LineageSettingsProvider/Android.bp b/resource-overlay/common/LineageSettingsProvider/Android.bp
new file mode 100644
index 0000000..c424c82
--- /dev/null
+++ b/resource-overlay/common/LineageSettingsProvider/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "LineageSettingsProviderOverlayCommon",
+    vendor: true,
+}
diff --git a/resource-overlay/common/LineageSettingsProvider/AndroidManifest.xml b/resource-overlay/common/LineageSettingsProvider/AndroidManifest.xml
new file mode 100644
index 0000000..b0d7f9e
--- /dev/null
+++ b/resource-overlay/common/LineageSettingsProvider/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="lineageos.settings.provider.overlay.common">
+    <overlay android:targetPackage="org.lineageos.lineagesettings"
+             android:isStatic="true"
+             android:priority="0" />
+</manifest>
diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/resource-overlay/common/LineageSettingsProvider/res/values/defaults.xml
similarity index 100%
rename from overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
rename to resource-overlay/common/LineageSettingsProvider/res/values/defaults.xml
diff --git a/resource-overlay/common/Settings/Android.bp b/resource-overlay/common/Settings/Android.bp
new file mode 100644
index 0000000..c67362e
--- /dev/null
+++ b/resource-overlay/common/Settings/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsResCommon",
+    vendor: true,
+}
diff --git a/resource-overlay/common/Settings/AndroidManifest.xml b/resource-overlay/common/Settings/AndroidManifest.xml
new file mode 100644
index 0000000..67e4cad
--- /dev/null
+++ b/resource-overlay/common/Settings/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.common">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="600"
+        android:targetPackage="com.android.settings" />
+</manifest>
diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/resource-overlay/common/Settings/res/values/config.xml
similarity index 86%
rename from overlay-lineage/packages/apps/Settings/res/values/config.xml
rename to resource-overlay/common/Settings/res/values/config.xml
index 4590a31..9e996ef 100644
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ b/resource-overlay/common/Settings/res/values/config.xml
@@ -3,7 +3,7 @@
      SPDX-FileCopyrightText: The LineageOS Project
      SPDX-License-Identifier: Apache-2.0
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
     <!-- Whether to show min refresh rate in display settings -->
     <bool name="config_show_min_refresh_rate_switch">true</bool>