diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf
index 1f5eb93c..c784f0ed 100644
--- a/bluetooth/bt_vendor_overlay_caiman.conf
+++ b/bluetooth/bt_vendor_overlay_caiman.conf
@@ -38,3 +38,5 @@ BtHalBqrEnable = false
 # <string> The hardware stage with old chip revision is no longer
 # supported by BT firmware.
 HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1
+
+ThreadDispatcherEnabled = true
diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf
index 1f5eb93c..c784f0ed 100644
--- a/bluetooth/bt_vendor_overlay_komodo.conf
+++ b/bluetooth/bt_vendor_overlay_komodo.conf
@@ -38,3 +38,5 @@ BtHalBqrEnable = false
 # <string> The hardware stage with old chip revision is no longer
 # supported by BT firmware.
 HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1
+
+ThreadDispatcherEnabled = true
diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf
index 1f5eb93c..c784f0ed 100644
--- a/bluetooth/bt_vendor_overlay_tokay.conf
+++ b/bluetooth/bt_vendor_overlay_tokay.conf
@@ -38,3 +38,5 @@ BtHalBqrEnable = false
 # <string> The hardware stage with old chip revision is no longer
 # supported by BT firmware.
 HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1
+
+ThreadDispatcherEnabled = true
diff --git a/device-caiman.mk b/device-caiman.mk
index bd6907ff..e5efe3b5 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -415,3 +415,12 @@ PRODUCT_PACKAGES += \
 #Component Override for Pixel Troubleshooting App
 PRODUCT_COPY_FILES += \
     device/google/caimito/caiman/caiman-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/caiman-component-overrides.xml
+
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.thread_dispatcher.enabled=true
+
+# Thread HAL
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES += \
+   com.google.caimito.hardware.threadnetwork
+endif
diff --git a/device-komodo.mk b/device-komodo.mk
index b0be1045..21761587 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -416,3 +416,12 @@ PRODUCT_PACKAGES += \
 #Component Override for Pixel Troubleshooting App
 PRODUCT_COPY_FILES += \
     device/google/caimito/komodo/komodo-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/komodo-component-overrides.xml
+
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.thread_dispatcher.enabled=true
+
+# Thread HAL
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES += \
+   com.google.caimito.hardware.threadnetwork
+endif
diff --git a/device-tokay.mk b/device-tokay.mk
index e39489ad..64f3861b 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -380,3 +380,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     device/google/caimito/tokay/tokay-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tokay-component-overrides.xml
 
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.thread_dispatcher.enabled=true
+
+# Thread HAL
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES += \
+   com.google.caimito.hardware.threadnetwork
+endif