diff --git a/cheetah/overlay_packages/SettingsOverlayGE2AE/Android.bp b/cheetah/overlay_packages/SettingsOverlayGE2AE/Android.bp
new file mode 100644
index 0000000..3eed2c3
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGE2AE/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGE2AE",
+    product_specific: true,
+}
diff --git a/cheetah/overlay_packages/SettingsOverlayGE2AE/AndroidManifest.xml b/cheetah/overlay_packages/SettingsOverlayGE2AE/AndroidManifest.xml
new file mode 100644
index 0000000..d1c278c
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGE2AE/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.ge2ae">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GE2AE"
+             android:isStatic="true" />
+</manifest>
diff --git a/cheetah/overlay_packages/SettingsOverlayGE2AE/res/drawable/regulatory_info.png b/cheetah/overlay_packages/SettingsOverlayGE2AE/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..20adedd
Binary files /dev/null and b/cheetah/overlay_packages/SettingsOverlayGE2AE/res/drawable/regulatory_info.png differ
diff --git a/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png b/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png
index 2c8e326..b85ff50 100644
Binary files a/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png and b/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png differ
diff --git a/cheetah/overlay_packages/SettingsOverlayGP4BC/Android.bp b/cheetah/overlay_packages/SettingsOverlayGP4BC/Android.bp
new file mode 100644
index 0000000..407592f
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGP4BC/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGP4BC",
+    product_specific: true,
+}
diff --git a/cheetah/overlay_packages/SettingsOverlayGP4BC/AndroidManifest.xml b/cheetah/overlay_packages/SettingsOverlayGP4BC/AndroidManifest.xml
new file mode 100644
index 0000000..20cc7e7
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGP4BC/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.gp4bc">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GP4BC"
+             android:isStatic="true" />
+</manifest>
diff --git a/cheetah/overlay_packages/SettingsOverlayGP4BC/res/drawable/regulatory_info.png b/cheetah/overlay_packages/SettingsOverlayGP4BC/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..4de2fbf
Binary files /dev/null and b/cheetah/overlay_packages/SettingsOverlayGP4BC/res/drawable/regulatory_info.png differ
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 6ad41e1..4fb13a5 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -259,7 +259,9 @@ PRODUCT_PACKAGES += \
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
-    SettingsOverlayGFE4J
+    SettingsOverlayGFE4J \
+    SettingsOverlayGE2AE \
+    SettingsOverlayGP4BC
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-panther.mk b/device-panther.mk
index fec7b58..4caf16c 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -247,7 +247,10 @@ PRODUCT_PACKAGES += \
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
-    SettingsOverlayG03Z5
+    SettingsOverlayG03Z5 \
+    SettingsOverlayGQML3 \
+    SettingsOverlayGVU6C \
+    SettingsOverlayGVU6C_VN
 
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png
index a0e84b0..e578c51 100644
Binary files a/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png and b/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png differ
diff --git a/panther/overlay_packages/SettingsOverlayGQML3/Android.bp b/panther/overlay_packages/SettingsOverlayGQML3/Android.bp
new file mode 100644
index 0000000..53814fe
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayGQML3/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGQML3",
+    product_specific: true,
+}
diff --git a/panther/overlay_packages/SettingsOverlayGQML3/AndroidManifest.xml b/panther/overlay_packages/SettingsOverlayGQML3/AndroidManifest.xml
new file mode 100644
index 0000000..6a42942
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayGQML3/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.gqml3">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GQML3"
+             android:isStatic="true" />
+</manifest>
diff --git a/panther/overlay_packages/SettingsOverlayGQML3/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayGQML3/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..3c38638
Binary files /dev/null and b/panther/overlay_packages/SettingsOverlayGQML3/res/drawable/regulatory_info.png differ
diff --git a/panther/overlay_packages/SettingsOverlayGVU6C/Android.bp b/panther/overlay_packages/SettingsOverlayGVU6C/Android.bp
new file mode 100644
index 0000000..4818676
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayGVU6C/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGVU6C",
+    product_specific: true,
+}
diff --git a/panther/overlay_packages/SettingsOverlayGVU6C/AndroidManifest.xml b/panther/overlay_packages/SettingsOverlayGVU6C/AndroidManifest.xml
new file mode 100644
index 0000000..508576e
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayGVU6C/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.gvu6c">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GVU6C"
+             android:isStatic="true"
+             android:priority="0" />
+</manifest>
diff --git a/panther/overlay_packages/SettingsOverlayGVU6C/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayGVU6C/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..cd56c49
Binary files /dev/null and b/panther/overlay_packages/SettingsOverlayGVU6C/res/drawable/regulatory_info.png differ
diff --git a/panther/overlay_packages/SettingsOverlayGVU6C_VN/Android.bp b/panther/overlay_packages/SettingsOverlayGVU6C_VN/Android.bp
new file mode 100644
index 0000000..24ec6dc
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayGVU6C_VN/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGVU6C_VN",
+    product_specific: true,
+}
diff --git a/panther/overlay_packages/SettingsOverlayGVU6C_VN/AndroidManifest.xml b/panther/overlay_packages/SettingsOverlayGVU6C_VN/AndroidManifest.xml
new file mode 100644
index 0000000..dbecb7f
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayGVU6C_VN/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.gvu6c_vn">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku,ro.boot.hardware.coo"
+             android:requiredSystemPropertyValue="GVU6C,VN"
+             android:isStatic="true"
+             android:priority="1" />
+</manifest>
diff --git a/panther/overlay_packages/SettingsOverlayGVU6C_VN/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayGVU6C_VN/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..9ed11f6
Binary files /dev/null and b/panther/overlay_packages/SettingsOverlayGVU6C_VN/res/drawable/regulatory_info.png differ