diff --git a/common.mk b/common.mk
index 690e751..eabccdf 100644
--- a/common.mk
+++ b/common.mk
@@ -30,10 +30,12 @@ PRODUCT_ENFORCE_RRO_TARGETS := *
 
 PRODUCT_PACKAGES += \
     FrameworksResCommon \
+    FrameworksResProduct \
+    FrameworksResTarget \
     SystemUIResCommon \
     TelephonyResCommon \
+    TelephonyResProduct \
     WifiResCommon \
-    FrameworksResTarget \
     WifiResTarget
 
 # A/B
diff --git a/resource-overlay/common/FrameworksProduct/Android.bp b/resource-overlay/common/FrameworksProduct/Android.bp
new file mode 100644
index 0000000..591195c
--- /dev/null
+++ b/resource-overlay/common/FrameworksProduct/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "FrameworksResProduct",
+    product_specific: true,
+}
diff --git a/resource-overlay/common/FrameworksProduct/AndroidManifest.xml b/resource-overlay/common/FrameworksProduct/AndroidManifest.xml
new file mode 100644
index 0000000..3f0cc57
--- /dev/null
+++ b/resource-overlay/common/FrameworksProduct/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="android.overlay.product">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="android" />
+</manifest>
diff --git a/resource-overlay/common/FrameworksProduct/res/values/config.xml b/resource-overlay/common/FrameworksProduct/res/values/config.xml
new file mode 100644
index 0000000..e540ad3
--- /dev/null
+++ b/resource-overlay/common/FrameworksProduct/res/values/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Default files to pin via Pinner Service -->
+    <string-array name="config_defaultPinnerServiceFiles" translatable="false">
+        <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
+        <item>"/apex/com.android.art/javalib/core-libart.jar"</item>
+        <item>"/system/framework/framework.jar"</item>
+        <item>"/system/framework/services.jar"</item>
+        <item>"/system/bin/surfaceflinger"</item>
+        <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
+    </string-array>
+
+    <!-- Bytes that the PinnerService will pin for Home app -->
+    <integer name="config_pinnerHomePinBytes">6291456</integer>
+</resources>
diff --git a/resource-overlay/lahaina/Frameworks/res/values/config_telephony.xml b/resource-overlay/common/FrameworksProduct/res/values/config_telephony.xml
similarity index 100%
rename from resource-overlay/lahaina/Frameworks/res/values/config_telephony.xml
rename to resource-overlay/common/FrameworksProduct/res/values/config_telephony.xml
diff --git a/resource-overlay/common/Telephony/res/values/config.xml b/resource-overlay/common/Telephony/res/values/config.xml
index d82a9f1..78d233c 100644
--- a/resource-overlay/common/Telephony/res/values/config.xml
+++ b/resource-overlay/common/Telephony/res/values/config.xml
@@ -6,13 +6,4 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Flag indicating whether the device supports RTT (real-time text) -->
     <bool name="config_support_rtt">true</bool>
-
-    <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
-    <string name="config_ims_mmtel_package" translatable="false">org.codeaurora.ims</string>
-
-    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
-    <string name="config_ims_rcs_package" translatable="false">vendor.qti.imsrcs</string>
-
-    <!-- String indicating the package name of the device GbaService implementation. -->
-    <string name="config_gba_package" translatable="false">com.qualcomm.qti.uimGbaApp</string>
 </resources>
diff --git a/resource-overlay/common/TelephonyProduct/Android.bp b/resource-overlay/common/TelephonyProduct/Android.bp
new file mode 100644
index 0000000..a8cd042
--- /dev/null
+++ b/resource-overlay/common/TelephonyProduct/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "TelephonyResProduct",
+    product_specific: true,
+}
diff --git a/resource-overlay/common/TelephonyProduct/AndroidManifest.xml b/resource-overlay/common/TelephonyProduct/AndroidManifest.xml
new file mode 100644
index 0000000..8d8fbf5
--- /dev/null
+++ b/resource-overlay/common/TelephonyProduct/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.phone.overlay.product">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="200"
+        android:targetPackage="com.android.phone" />
+</manifest>
diff --git a/resource-overlay/common/TelephonyProduct/res/values/config.xml b/resource-overlay/common/TelephonyProduct/res/values/config.xml
new file mode 100644
index 0000000..8e250ae
--- /dev/null
+++ b/resource-overlay/common/TelephonyProduct/res/values/config.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
+    <string name="config_ims_mmtel_package" translatable="false">org.codeaurora.ims</string>
+
+    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
+    <string name="config_ims_rcs_package" translatable="false">vendor.qti.imsrcs</string>
+
+    <!-- String indicating the package name of the device GbaService implementation. -->
+    <string name="config_gba_package" translatable="false">com.qualcomm.qti.uimGbaApp</string>
+</resources>
diff --git a/resource-overlay/lahaina/Frameworks/res/values/config.xml b/resource-overlay/lahaina/Frameworks/res/values/config.xml
index b7b4734..b95e0ce 100644
--- a/resource-overlay/lahaina/Frameworks/res/values/config.xml
+++ b/resource-overlay/lahaina/Frameworks/res/values/config.xml
@@ -7,17 +7,4 @@
     <!-- When true use the linux /dev/input/event subsystem to detect the switch changes
          on the headphone/microphone jack. When false use the older uevent framework. -->
     <bool name="config_useDevInputEventForAudioJack">true</bool>
-
-    <!-- Default files to pin via Pinner Service -->
-    <string-array name="config_defaultPinnerServiceFiles" translatable="false">
-        <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
-        <item>"/apex/com.android.art/javalib/core-libart.jar"</item>
-        <item>"/system/framework/framework.jar"</item>
-        <item>"/system/framework/services.jar"</item>
-        <item>"/system/bin/surfaceflinger"</item>
-        <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
-    </string-array>
-
-    <!-- Bytes that the PinnerService will pin for Home app -->
-    <integer name="config_pinnerHomePinBytes">6291456</integer>
 </resources>