diff --git a/audio/cheetah/tuning/waves/waves_config.ini b/audio/cheetah/tuning/waves/waves_config.ini
index b9343d5..c684451 100644
--- a/audio/cheetah/tuning/waves/waves_config.ini
+++ b/audio/cheetah/tuning/waves/waves_config.ini
@@ -19,7 +19,7 @@ SR_COMMON   = 48000
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_ORIENTATION_SUBTYPES]
-OST_SPEAKER = 0:12,90:13,180:12,270:14
+OST_SPEAKER = 0:12,90:13,180:12,270:0|13
 
 ########################################################################################################
 # This defines available preset configurations.
diff --git a/audio/panther/tuning/waves/waves_config.ini b/audio/panther/tuning/waves/waves_config.ini
index b9343d5..c684451 100644
--- a/audio/panther/tuning/waves/waves_config.ini
+++ b/audio/panther/tuning/waves/waves_config.ini
@@ -19,7 +19,7 @@ SR_COMMON   = 48000
 # This can be configured by Waves or platform vendor.
 ########################################################################################################
 [HAL_ORIENTATION_SUBTYPES]
-OST_SPEAKER = 0:12,90:13,180:12,270:14
+OST_SPEAKER = 0:12,90:13,180:12,270:0|13
 
 ########################################################################################################
 # This defines available preset configurations.
diff --git a/cheetah/overlay_packages/SettingsOverlayGFE4J/Android.bp b/cheetah/overlay_packages/SettingsOverlayGFE4J/Android.bp
new file mode 100644
index 0000000..6703cbd
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGFE4J/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGFE4J",
+    product_specific: true,
+}
diff --git a/cheetah/overlay_packages/SettingsOverlayGFE4J/AndroidManifest.xml b/cheetah/overlay_packages/SettingsOverlayGFE4J/AndroidManifest.xml
new file mode 100644
index 0000000..3d2e649
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGFE4J/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.gfe4j">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GFE4J"
+             android:isStatic="true" />
+</manifest>
diff --git a/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png b/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..72ce864
Binary files /dev/null and b/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png differ
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 478c67d..3cf1854 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -165,8 +165,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/pantah/powerstats/cheetah
-
+    device/google/pantah/powerstats/cheetah \
+    device/google/pantah
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
@@ -212,3 +212,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayGFE4J
diff --git a/device-panther.mk b/device-panther.mk
index 0527a54..cc07c2e 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -154,7 +154,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/pantah/powerstats/panther
+    device/google/pantah/powerstats/panther \
+    device/google/pantah
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
@@ -203,3 +204,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayG03Z5
diff --git a/panther/overlay_packages/SettingsOverlayG03Z5/Android.bp b/panther/overlay_packages/SettingsOverlayG03Z5/Android.bp
new file mode 100644
index 0000000..ecf67b5
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayG03Z5/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayG03Z5",
+    product_specific: true,
+}
diff --git a/panther/overlay_packages/SettingsOverlayG03Z5/AndroidManifest.xml b/panther/overlay_packages/SettingsOverlayG03Z5/AndroidManifest.xml
new file mode 100644
index 0000000..5a85508
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayG03Z5/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.g03z5">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="G03Z5"
+             android:isStatic="true" />
+</manifest>
diff --git a/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..0b3a1f5
Binary files /dev/null and b/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png differ
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index b52c8d3..be287e8 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -1,6 +1,4 @@
-[CCC]format=1
-[CCC]kind=0
-[CCC]settings=1
+[CCC]version=2
 [CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
 [CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
 [CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
@@ -111,8 +109,26 @@ xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
-[HAL]antenna_pair_azimuth=3
-[HAL]antenna_pair_elevation=4
-[HAL]tx_antenna=0
-[HAL]minimum_system_offset_uwbtime0=200
 restricted_channels=0
+[HAL]aoa_capability=1
+[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 3
+[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 0
+[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 0
+[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 3
+[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 0
+[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 3
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 0
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 0
+[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 3
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
+[HAL]minimum_system_offset_uwbtime0=200
+coex_gpio=4
+coex_delay_us=1000
+coex_margin_us=500
+coex_interval_us=2000