diff --git a/device.mk b/device.mk
index 3f0cf5e..eb172da 100644
--- a/device.mk
+++ b/device.mk
@@ -43,7 +43,9 @@ DEVICE_PACKAGE_OVERLAYS += \
 
 PRODUCT_ENFORCE_RRO_TARGETS := *
 PRODUCT_PACKAGES += \
-    CarrierConfigResCommon
+    CarrierConfigResCommon \
+    FrameworksResTarget \
+    WifiResTarget
 
 # AAPT
 PRODUCT_AAPT_CONFIG := normal
diff --git a/overlay/FrameworksResTarget/Android.bp b/overlay/FrameworksResTarget/Android.bp
new file mode 100644
index 0000000..ce782c1
--- /dev/null
+++ b/overlay/FrameworksResTarget/Android.bp
@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "FrameworksResTarget",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/overlay/FrameworksResTarget/AndroidManifest.xml b/overlay/FrameworksResTarget/AndroidManifest.xml
new file mode 100644
index 0000000..b146007
--- /dev/null
+++ b/overlay/FrameworksResTarget/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.overlay.target">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="250"
+        android:targetPackage="android" />
+</manifest>
diff --git a/overlay/FrameworksResTarget/res/values/config.xml b/overlay/FrameworksResTarget/res/values/config.xml
new file mode 100644
index 0000000..c0362c7
--- /dev/null
+++ b/overlay/FrameworksResTarget/res/values/config.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
+<resources>
+
+    <!-- Control whether the always on display mode is available. This should only be enabled on
+         devices where the display has been tuned to be power efficient in DOZE and/or DOZE_SUSPEND
+         states. -->
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+
+    <!-- Whether a software navigation bar should be shown. NOTE: in the future this may be
+         autodetected from the Configuration. -->
+    <bool name="config_showNavigationBar">true</bool>
+
+    <!-- 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>
+
+    <!-- Idle current for bluetooth controller. 0 by default -->
+    <integer name="config_bluetooth_idle_cur_ma">6</integer>
+
+    <!-- Operating volatage for bluetooth controller. 0 by default -->
+    <integer name="config_bluetooth_operating_voltage_mv">3700</integer>
+
+    <!-- Rx current for bluetooth controller. 0 by default-->
+    <integer name="config_bluetooth_rx_cur_ma">28</integer>
+
+    <!-- Tx current for bluetooth controller. 0 by default -->
+    <integer name="config_bluetooth_tx_cur_ma">36</integer>
+
+    <!-- Telephony qualified networks service package name to bind to by default. -->
+    <string name="config_qualified_networks_service_package">vendor.qti.iwlan</string>
+
+    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay, an
+         empty string is passed in -->
+    <string name="config_wlan_data_service_package">vendor.qti.iwlan</string>
+
+    <!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an
+         empty string is passed in -->
+    <string name="config_wlan_network_service_package">vendor.qti.iwlan</string>
+
+    <!-- Default files to pin via Pinner Service -->
+    <string-array name="config_defaultPinnerServiceFiles">
+        <item>/system/framework/arm64/boot-framework.oat</item>
+        <item>/system/framework/arm/boot-framework.oat</item>
+        <item>/apex/com.android.art/javalib/arm64/boot-core-libart.oat</item>
+        <item>/apex/com.android.art/javalib/arm/boot-core-libart.oat</item>
+        <item>/apex/com.android.art/javalib/arm64/boot-okhttp.oat</item>
+        <item>/apex/com.android.art/javalib/arm/boot-okhttp.oat</item>
+        <item>/apex/com.android.art/javalib/arm64/boot.vdex</item>
+        <item>/apex/com.android.art/javalib/arm/boot.vdex</item>
+        <item>/apex/com.android.art/javalib/arm64/boot-core-libart.vdex</item>
+        <item>/apex/com.android.art/javalib/arm/boot-core-libart.vdex</item>
+        <item>/apex/com.android.art/javalib/arm64/boot-core-libart.art</item>
+        <item>/apex/com.android.art/javalib/arm/boot-core-libart.art</item>
+        <item>/system/framework/framework-res.apk</item>
+        <item>/system/lib64/libhwui.so</item>
+        <item>/system/lib/libhwui.so</item>
+        <item>/system/framework/boot-framework.vdex</item>
+        <item>/system/framework/oat/arm64/services.vdex</item>
+        <item>/system/framework/oat/arm64/services.odex</item>
+        <item>/apex/com.android.art/javalib/arm64/boot.oat</item>
+        <item>/apex/com.android.art/javalib/arm/boot.oat</item>
+        <item>/system/framework/telephony-common.jar</item>
+        <item>/system/framework/arm64/boot-telephony-common.art</item>
+        <item>/system/lib64/libsurfaceflinger.so</item>
+        <item>/apex/com.android.art/javalib/core-oj.jar</item>
+        <item>/apex/com.android.art/javalib/core-libart.jar</item>
+    </string-array>
+
+     <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
+          when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
+          where: IDs are unique per device, Modality as defined in BiometricAuthenticator.java,
+          and Strength as defined in Authenticators.java -->
+    <string-array name="config_biometric_sensors" translatable="false" >
+        <item>0:2:15</item>
+    </string-array>
+
+</resources>
diff --git a/overlay/WifiResTarget/Android.bp b/overlay/WifiResTarget/Android.bp
new file mode 100644
index 0000000..e0b8a92
--- /dev/null
+++ b/overlay/WifiResTarget/Android.bp
@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "WifiResTarget",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/overlay/WifiResTarget/AndroidManifest.xml b/overlay/WifiResTarget/AndroidManifest.xml
new file mode 100644
index 0000000..c635152
--- /dev/null
+++ b/overlay/WifiResTarget/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.wifi.resources.overlay.target">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="250"
+        android:targetName="WifiCustomization"
+        android:targetPackage="com.android.wifi.resources" />
+</manifest>
diff --git a/overlay/WifiResTarget/res/values/config.xml b/overlay/WifiResTarget/res/values/config.xml
new file mode 100644
index 0000000..d0d6fe1
--- /dev/null
+++ b/overlay/WifiResTarget/res/values/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The Linux Foundation
+     SPDX-License-Identifier: BSD-3-Clause
+-->
+<resources>
+
+    <!-- Enable concurrent restricted connectivity + internet connectivity
+         Note: this is conditional on the device supporting dual concurrent STAs. -->
+    <bool translatable="false" name="config_wifiMultiStaRestrictedConcurrencyEnabled">true</bool>
+
+    <!-- Wifi driver supports IEEE80211AX single user beamformee for softap -->
+    <bool name="config_wifiSoftapHeSuBeamformeeSupported">true</bool>
+
+    <!-- Wifi driver supports IEEE80211AX single user beamformer for softap -->
+    <bool name="config_wifiSoftapHeSuBeamformerSupported">true</bool>
+
+    <!-- Wifi driver supports IEEE80211AX for softap -->
+    <bool name="config_wifiSoftapIeee80211axSupported">true</bool>
+
+</resources>