diff --git a/device-husky.mk b/device-husky.mk
index 649f0d9..2ca4dc2 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -345,9 +345,9 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.rls_supported=false
 
-# SKU specific RROs
+# Settings Overlay
 PRODUCT_PACKAGES += \
-    SettingsOverlayGE9DP
+    SettingsHuskyOverlay
 
 # Display RRS default Config
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1008x2244@120
diff --git a/device-shiba.mk b/device-shiba.mk
index d2b5711..ee7c5f5 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -322,9 +322,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     hypervisor.memory_reclaim.supported=1
 
-# SKU specific RROs
+# Settings Overlay
 PRODUCT_PACKAGES += \
-    SettingsOverlayGZPF0
+    SettingsShibaOverlay
 
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/Android.bp b/husky/overlay_packages/SettingsHuskyOverlay/Android.bp
new file mode 100644
index 0000000..21d02b4
--- /dev/null
+++ b/husky/overlay_packages/SettingsHuskyOverlay/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2023 The Android Open Source 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.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsHuskyOverlay",
+    product_specific: true,
+}
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/AndroidManifest.xml b/husky/overlay_packages/SettingsHuskyOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..4df104f
--- /dev/null
+++ b/husky/overlay_packages/SettingsHuskyOverlay/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.husky">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:isStatic="true" />
+</manifest>
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_g1mnw_cn.png b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_g1mnw_cn.png
new file mode 100644
index 0000000..3f41764
Binary files /dev/null and b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_g1mnw_cn.png differ
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_g1mnw_vn.png b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_g1mnw_vn.png
new file mode 100644
index 0000000..fdccad9
Binary files /dev/null and b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_g1mnw_vn.png differ
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_gc3ve_cn.png b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_gc3ve_cn.png
new file mode 100644
index 0000000..61a015e
Binary files /dev/null and b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_gc3ve_cn.png differ
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_gc3ve_vn.png b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_gc3ve_vn.png
new file mode 100644
index 0000000..684a855
Binary files /dev/null and b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_gc3ve_vn.png differ
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_ge9dp_cn.png b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_ge9dp_cn.png
new file mode 100644
index 0000000..169b4e2
Binary files /dev/null and b/husky/overlay_packages/SettingsHuskyOverlay/res/drawable/regulatory_info_ge9dp_cn.png differ
diff --git a/husky/overlay_packages/SettingsHuskyOverlay/res/values/config.xml b/husky/overlay_packages/SettingsHuskyOverlay/res/values/config.xml
new file mode 100644
index 0000000..d93b98b
--- /dev/null
+++ b/husky/overlay_packages/SettingsHuskyOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source 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>
+    <string name="config_regulatory_info_overlay_package_name" translatable="false">com.android.settings.husky</string>
+</resources>
diff --git a/husky/overlay_packages/SettingsOverlayGE9DP/Android.bp b/husky/overlay_packages/SettingsOverlayGE9DP/Android.bp
deleted file mode 100644
index b34b8f3..0000000
--- a/husky/overlay_packages/SettingsOverlayGE9DP/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-runtime_resource_overlay {
-    name: "SettingsOverlayGE9DP",
-    product_specific: true,
-}
diff --git a/husky/overlay_packages/SettingsOverlayGE9DP/AndroidManifest.xml b/husky/overlay_packages/SettingsOverlayGE9DP/AndroidManifest.xml
deleted file mode 100644
index 462dc94..0000000
--- a/husky/overlay_packages/SettingsOverlayGE9DP/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay.ge9dp">
-    <application android:hasCode="false" />
-    <overlay android:targetPackage="com.android.settings"
-             android:requiredSystemPropertyName="ro.boot.hardware.sku"
-             android:requiredSystemPropertyValue="GE9DP"
-             android:isStatic="true" />
-</manifest>
diff --git a/husky/overlay_packages/SettingsOverlayGE9DP/res/drawable/regulatory_info.png b/husky/overlay_packages/SettingsOverlayGE9DP/res/drawable/regulatory_info.png
deleted file mode 100644
index f99f96d..0000000
Binary files a/husky/overlay_packages/SettingsOverlayGE9DP/res/drawable/regulatory_info.png and /dev/null differ
diff --git a/shiba/overlay_packages/SettingsOverlayGZPF0/Android.bp b/shiba/overlay_packages/SettingsOverlayGZPF0/Android.bp
deleted file mode 100644
index 1bfab96..0000000
--- a/shiba/overlay_packages/SettingsOverlayGZPF0/Android.bp
+++ /dev/null
@@ -1,8 +0,0 @@
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-runtime_resource_overlay {
-    name: "SettingsOverlayGZPF0",
-    product_specific: true,
-}
diff --git a/shiba/overlay_packages/SettingsOverlayGZPF0/AndroidManifest.xml b/shiba/overlay_packages/SettingsOverlayGZPF0/AndroidManifest.xml
deleted file mode 100644
index 6936aec..0000000
--- a/shiba/overlay_packages/SettingsOverlayGZPF0/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay.gzpf0">
-    <application android:hasCode="false" />
-    <overlay android:targetPackage="com.android.settings"
-             android:requiredSystemPropertyName="ro.boot.hardware.sku"
-             android:requiredSystemPropertyValue="GZPF0"
-             android:isStatic="true" />
-</manifest>
diff --git a/shiba/overlay_packages/SettingsOverlayGZPF0/res/drawable/regulatory_info.png b/shiba/overlay_packages/SettingsOverlayGZPF0/res/drawable/regulatory_info.png
deleted file mode 100644
index 4a5839b..0000000
Binary files a/shiba/overlay_packages/SettingsOverlayGZPF0/res/drawable/regulatory_info.png and /dev/null differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/Android.bp b/shiba/overlay_packages/SettingsShibaOverlay/Android.bp
new file mode 100644
index 0000000..82f6d32
--- /dev/null
+++ b/shiba/overlay_packages/SettingsShibaOverlay/Android.bp
@@ -0,0 +1,24 @@
+//
+// Copyright (C) 2023 The Android Open Source 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.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsShibaOverlay",
+    product_specific: true,
+}
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/AndroidManifest.xml b/shiba/overlay_packages/SettingsShibaOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..a9dc978
--- /dev/null
+++ b/shiba/overlay_packages/SettingsShibaOverlay/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.shiba">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:isStatic="true" />
+</manifest>
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_cn.png
new file mode 100644
index 0000000..2ca5fa6
Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_cn.png differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_vn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_vn.png
new file mode 100644
index 0000000..1fd1d71
Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_vn.png differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_cn.png
new file mode 100644
index 0000000..da0634d
Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_cn.png differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_vn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_vn.png
new file mode 100644
index 0000000..c0d167d
Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_vn.png differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_cn.png
new file mode 100644
index 0000000..03a4819
Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_cn.png differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_vn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_vn.png
new file mode 100644
index 0000000..86da4b8
Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_vn.png differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gzpf0_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gzpf0_cn.png
new file mode 100644
index 0000000..59fc3b3
Binary files /dev/null and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gzpf0_cn.png differ
diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/values/config.xml b/shiba/overlay_packages/SettingsShibaOverlay/res/values/config.xml
new file mode 100644
index 0000000..346ed19
--- /dev/null
+++ b/shiba/overlay_packages/SettingsShibaOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source 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>
+    <string name="config_regulatory_info_overlay_package_name" translatable="false">com.android.settings.shiba</string>
+</resources>