diff --git a/device-felix.mk b/device-felix.mk
index 8783dd0..c24377b 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -194,7 +194,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/felix/powerstats/felix
+    device/google/felix/powerstats/felix \
+    device/google/felix
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
@@ -233,7 +234,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
-    SettingsOverlayGPQ72
+    SettingsOverlayG0B96
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
@@ -267,6 +268,11 @@ endif
 PRODUCT_PACKAGES += \
         WifiOverlay2023Mid_F10
 
+# MIPI Coex Configs
+PRODUCT_COPY_FILES += \
+    device/google/felix/felix/radio/felix_camera_front_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_front_mipi_coex_table.csv \
+    device/google/felix/felix/radio/felix_display_secondary_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_secondary_mipi_coex_table.csv
+
 PRODUCT_SOONG_NAMESPACES += device/google/felix
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/felix/device_framework_matrix_product_felix.xml
diff --git a/felix/overlay_packages/SettingsOverlayGPQ72/Android.bp b/felix/overlay_packages/SettingsOverlayG0B96/Android.bp
similarity index 78%
rename from felix/overlay_packages/SettingsOverlayGPQ72/Android.bp
rename to felix/overlay_packages/SettingsOverlayG0B96/Android.bp
index 93a1620..f39ee73 100644
--- a/felix/overlay_packages/SettingsOverlayGPQ72/Android.bp
+++ b/felix/overlay_packages/SettingsOverlayG0B96/Android.bp
@@ -3,6 +3,6 @@ package {
 }
 
 runtime_resource_overlay {
-    name: "SettingsOverlayGPQ72",
+    name: "SettingsOverlayG0B96",
     product_specific: true,
 }
diff --git a/felix/overlay_packages/SettingsOverlayGPQ72/AndroidManifest.xml b/felix/overlay_packages/SettingsOverlayG0B96/AndroidManifest.xml
similarity index 75%
rename from felix/overlay_packages/SettingsOverlayGPQ72/AndroidManifest.xml
rename to felix/overlay_packages/SettingsOverlayG0B96/AndroidManifest.xml
index 10bf5a3..bd79323 100644
--- a/felix/overlay_packages/SettingsOverlayGPQ72/AndroidManifest.xml
+++ b/felix/overlay_packages/SettingsOverlayG0B96/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay.gpq72">
+    package="com.android.settings.overlay.g0b96">
     <application android:hasCode="false" />
     <overlay android:targetPackage="com.android.settings"
              android:requiredSystemPropertyName="ro.boot.hardware.sku"
-             android:requiredSystemPropertyValue="GPQ72"
+             android:requiredSystemPropertyValue="G0B96"
              android:isStatic="true" />
 </manifest>
diff --git a/felix/overlay_packages/SettingsOverlayG0B96/res/drawable/regulatory_info.png b/felix/overlay_packages/SettingsOverlayG0B96/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..1d04e6e
Binary files /dev/null and b/felix/overlay_packages/SettingsOverlayG0B96/res/drawable/regulatory_info.png differ
diff --git a/felix/overlay_packages/SettingsOverlayGPQ72/res/drawable/regulatory_info.png b/felix/overlay_packages/SettingsOverlayGPQ72/res/drawable/regulatory_info.png
deleted file mode 100644
index f2b2358..0000000
Binary files a/felix/overlay_packages/SettingsOverlayGPQ72/res/drawable/regulatory_info.png and /dev/null differ
diff --git a/felix/radio/felix_camera_front_mipi_coex_table.csv b/felix/radio/felix_camera_front_mipi_coex_table.csv
new file mode 100644
index 0000000..c4b6f8f
--- /dev/null
+++ b/felix/radio/felix_camera_front_mipi_coex_table.csv
@@ -0,0 +1,3 @@
+706560,718850
+
+2417000,2452000,706560
diff --git a/felix/radio/felix_display_secondary_mipi_coex_table.csv b/felix/radio/felix_display_secondary_mipi_coex_table.csv
new file mode 100644
index 0000000..f18af97
--- /dev/null
+++ b/felix/radio/felix_display_secondary_mipi_coex_table.csv
@@ -0,0 +1,4 @@
+730000,670000
+
+1810000,1835000,670000
+720000,740000,670000
diff --git a/location/gps.xml.f10 b/location/gps.xml.f10
index 6e005ae..d0d0045 100644
--- a/location/gps.xml.f10
+++ b/location/gps.xml.f10
@@ -35,7 +35,6 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.f10 b/location/gps_user.xml.f10
index 02afd01..83fe1ed 100644
--- a/location/gps_user.xml.f10
+++ b/location/gps_user.xml.f10
@@ -34,7 +34,6 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"