diff --git a/device-caiman.mk b/device-caiman.mk
index 85e4806b..a97a6597 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -153,14 +153,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.mcp.server.enabled=true \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
 
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
 	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index ad0815b7..7d9ea847 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -164,14 +164,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.mcp.server.enabled=true \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
 
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
 	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index fdcd693e..1e516417 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -137,14 +137,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.mcp.server.enabled=true \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
 
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
 	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index 9c62ce7b..2f48bccc 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -138,14 +138,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.mcp.server.enabled=true \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
 
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
 	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index a10ff54c..218c726d 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -158,14 +158,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.mcp.server.enabled=true \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true \
-	bluetooth.profile.bap.broadcast.assist.enabled=true \
-	bluetooth.profile.bap.broadcast.source.enabled=true
 
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
 	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \