diff --git a/caiman/rro_overlays/UwbOverlay/res/values/config.xml b/caiman/rro_overlays/UwbOverlay/res/values/config.xml
index 315f18f2..2e9b3222 100644
--- a/caiman/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/caiman/rro_overlays/UwbOverlay/res/values/config.xml
@@ -34,4 +34,8 @@
     <!-- Whether multicast list update notification v2 is supported or not.
      If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
     <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
+
+    <!-- Whether multicast list update response v2 is supported or not.
+     If enabled, the response will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_rsp_v2_supported">true</bool>
 </resources>
diff --git a/device-caiman.mk b/device-caiman.mk
index 46d95470..9def00d9 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -288,6 +288,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     device/google/caimito/powerstats/caiman
 
+# UWB Overlay
+PRODUCT_PACKAGES += \
+    UwbOverlayCM4
+
 # WiFi Overlay
 PRODUCT_PACKAGES += \
     WifiOverlay2024
diff --git a/device-komodo.mk b/device-komodo.mk
index 1b0268b8..4496f6e0 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -308,6 +308,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += \
     device/google/caimito/powerstats/komodo
 
+# UWB Overlay
+PRODUCT_PACKAGES += \
+    UwbOverlayKM4
+
 # WiFi Overlay
 PRODUCT_PACKAGES += \
     WifiOverlay2024
diff --git a/komodo/rro_overlays/UwbOverlay/res/values/config.xml b/komodo/rro_overlays/UwbOverlay/res/values/config.xml
index de6d8c3c..be74e3ed 100644
--- a/komodo/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/komodo/rro_overlays/UwbOverlay/res/values/config.xml
@@ -34,4 +34,8 @@
      <!-- Whether multicast list update notification v2 is supported or not.
      If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
     <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
+
+    <!-- Whether multicast list update response v2 is supported or not.
+     If enabled, the response will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_rsp_v2_supported">true</bool>
 </resources>