diff --git a/caiman/rro_overlays/UwbOverlay/Android.bp b/caiman/rro_overlays/UwbOverlay/Android.bp
index db283b43..64312d88 100644
--- a/caiman/rro_overlays/UwbOverlay/Android.bp
+++ b/caiman/rro_overlays/UwbOverlay/Android.bp
@@ -16,3 +16,11 @@ runtime_resource_overlay {
     sdk_version: "current",
     product_specific: true,
 }
+
+runtime_resource_overlay {
+    name: "UwbOverlayCM4Gsi",
+    theme: "UwbOverlayCM4",
+    certificate: "platform",
+    sdk_version: "current",
+    vendor: true,
+}
diff --git a/device-caiman.mk b/device-caiman.mk
index ce436692..683df297 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -293,7 +293,8 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # UWB Overlay
 PRODUCT_PACKAGES += \
-    UwbOverlayCM4
+    UwbOverlayCM4 \
+    UwbOverlayCM4Gsi
 
 # WiFi Overlay
 PRODUCT_PACKAGES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 18d62ad4..0fed4ec4 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -313,7 +313,8 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # UWB Overlay
 PRODUCT_PACKAGES += \
-    UwbOverlayKM4
+    UwbOverlayKM4 \
+    UwbOverlayKM4Gsi
 
 # WiFi Overlay
 PRODUCT_PACKAGES += \
diff --git a/komodo/rro_overlays/UwbOverlay/Android.bp b/komodo/rro_overlays/UwbOverlay/Android.bp
index c0d723f7..5c6a3df2 100644
--- a/komodo/rro_overlays/UwbOverlay/Android.bp
+++ b/komodo/rro_overlays/UwbOverlay/Android.bp
@@ -14,5 +14,13 @@ runtime_resource_overlay {
     theme: "UwbOverlayKM4",
     certificate: "platform",
     sdk_version: "current",
-    product_specific: true
+    product_specific: true,
+}
+
+runtime_resource_overlay {
+    name: "UwbOverlayKM4Gsi",
+    theme: "UwbOverlayKM4",
+    certificate: "platform",
+    sdk_version: "current",
+    vendor: true,
 }