diff --git a/overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1-r30.ebuild b/overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1-r31.ebuild
similarity index 100%
rename from overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1-r30.ebuild
rename to overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1-r31.ebuild
diff --git a/overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1.ebuild b/overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1.ebuild
index 2d85d16..9606ea7 100644
--- a/overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1.ebuild
+++ b/overlay-coral/chromeos-base/chromeos-bsp-coral/chromeos-bsp-coral-0.0.1.ebuild
@@ -26,7 +26,6 @@
 	doappid "{5A3AB642-2A67-470A-8F37-37E737A53CFC}" "CHROMEBOOK"
 
 	unibuild_install_audio_files
-	unibuild_install_bluetooth_files
 	unibuild_install_thermal_files
 
 	insinto "/usr/share/power_manager/board_specific"
diff --git a/overlay-coral/chromeos-base/chromeos-config-bsp-coral/files/model.yaml b/overlay-coral/chromeos-base/chromeos-config-bsp-coral/files/model.yaml
index 92d0f21..a418b99 100644
--- a/overlay-coral/chromeos-base/chromeos-config-bsp-coral/files/model.yaml
+++ b/overlay-coral/chromeos-base/chromeos-config-bsp-coral/files/model.yaml
@@ -32,17 +32,12 @@
       destination: "{{$ucm-dest}}/{{$card}}.{{ucm-suffix}}.conf"
 
 device-config: &device_config
-  $bluetooth-device: "common"
   $dptf-device: "{{$device-name}}"
   $touchpad-wakeup: "1"
   $test-label: "{{$device-name}}"
   name: "{{$device-name}}"
   audio:
     main: *audio_common
-  bluetooth:
-    config:
-      build-path: "{{$bluetooth-device}}/bluetooth/main.conf"
-      system-path: "/etc/bluetooth/{{$bluetooth-device}}/main.conf"
   camera:
     legacy-usb: True
   firmware:
@@ -120,7 +115,6 @@
         - $sku-id: 33
           config: *device_config
     - $device-name: "blacktip"
-      $bluetooth-device: "blacktip"
       $dptf-device: "astronaut"
       products:
         - $whitelabel-tag: "" # default
@@ -136,7 +130,6 @@
         - $sku-id: 36
           config: *wl_device_config
     - $device-name: "blacktip360"
-      $bluetooth-device: "blacktip"
       $ucm: "2mic"
       $touchpad-wakeup: "0"
       $dptf-device: "astronaut"
@@ -157,7 +150,6 @@
         - $sku-id: 38
           config: *wl_convertible_config
     - $device-name: "blacktiplte"
-      $bluetooth-device: "blacktip"
       $dptf-device: "astronaut"
       products:
         - $whitelabel-tag: "default" # default
diff --git a/overlay-drallion/chromeos-base/chromeos-bsp-drallion/chromeos-bsp-drallion-9999.ebuild b/overlay-drallion/chromeos-base/chromeos-bsp-drallion/chromeos-bsp-drallion-9999.ebuild
index f7e8764..8ad1297 100644
--- a/overlay-drallion/chromeos-base/chromeos-bsp-drallion/chromeos-bsp-drallion-9999.ebuild
+++ b/overlay-drallion/chromeos-base/chromeos-bsp-drallion/chromeos-bsp-drallion-9999.ebuild
@@ -31,5 +31,4 @@
 
 	unibuild_install_audio_files
 	unibuild_install_thermal_files
-	unibuild_install_bluetooth_files
 }
diff --git a/overlay-drallion/chromeos-base/chromeos-config-bsp-drallion/files/model.yaml b/overlay-drallion/chromeos-base/chromeos-config-bsp-drallion/files/model.yaml
index ee7e6af..f36814c 100644
--- a/overlay-drallion/chromeos-base/chromeos-config-bsp-drallion/files/model.yaml
+++ b/overlay-drallion/chromeos-base/chromeos-config-bsp-drallion/files/model.yaml
@@ -52,11 +52,6 @@
         # EQ/DRC DSP configuration file
         - source: "{{$device-name}}/audio/cras-config/dsp.ini"
           destination: "{{$cras_root}}/{{cras-config-dir}}/dsp.ini"
-  $bluetooth-device: "common"
-  bluetooth:
-    config:
-      build-path: "{{$bluetooth-device}}/bluetooth/main.conf"
-      system-path: "/etc/bluetooth/{{$bluetooth-device}}/main.conf"
   hardware-properties:
     has-touchscreen: True
 
diff --git a/overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1-r61.ebuild b/overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1-r62.ebuild
similarity index 100%
rename from overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1-r61.ebuild
rename to overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1-r62.ebuild
diff --git a/overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1.ebuild b/overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1.ebuild
index 7b57cdd..4993a29 100644
--- a/overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1.ebuild
+++ b/overlay-nami/chromeos-base/chromeos-bsp-nami/chromeos-bsp-nami-0.0.1.ebuild
@@ -35,7 +35,6 @@
 
 	unibuild_install_audio_files
 	unibuild_install_thermal_files
-	unibuild_install_bluetooth_files
 
 	# Projects might support multiple panels with the same Wacom digitizer
 	# chip but have different firmwares for fine-tuned performance.
diff --git a/overlay-nami/chromeos-base/chromeos-config-bsp-nami/files/model.yaml b/overlay-nami/chromeos-base/chromeos-config-bsp-nami/files/model.yaml
index 1744705..33834a2 100644
--- a/overlay-nami/chromeos-base/chromeos-config-bsp-nami/files/model.yaml
+++ b/overlay-nami/chromeos-base/chromeos-config-bsp-nami/files/model.yaml
@@ -27,11 +27,6 @@
 
 common-config: &common_config
   name: "{{$device-name}}"
-  $bluetooth-device: "common"
-  bluetooth:
-    config:
-      build-path: "{{$bluetooth-device}}/bluetooth/main.conf"
-      system-path: "/etc/bluetooth/{{$bluetooth-device}}/main.conf"
   identity:
     platform-name: "Poppy"
     smbios-name-match: "Nami"
@@ -95,7 +90,6 @@
 chromeos:
   devices:
     - $device-name: "akali"
-      $bluetooth-device: "{{$device-name}}"
       $touchpad-wakeup: "1"
       skus:
         - $sku-id: 0x29e1
@@ -104,7 +98,6 @@
         - $sku-id: 0x2861
           config: *device_specific_audio_device_config
     - $device-name: "akali360"
-      $bluetooth-device: "{{$device-name}}"
       skus:
         - $sku-id: 0x2be7
           config: *convertible_device_config
@@ -117,7 +110,6 @@
         - $sku-id: 0x3a7b
           config: *device_specific_audio_device_config
     - $device-name: "pantheon"
-      $bluetooth-device: "{{$device-name}}"
       $internal-backlight-no-als-battery-brightness: "51.0"
       skus:
         - $sku-id: 0x3f62
@@ -148,7 +140,6 @@
             <<: *convertible_device_config
             $dptf-file: "dptf-pyke.dv"
     - $device-name: "sona"
-      $bluetooth-device: "{{$device-name}}"
       $internal-backlight-no-als-battery-brightness: "63.0"
       skus:
         - $sku-id: 0x3ae2
@@ -196,7 +187,6 @@
               <<: *power_common
               $has-keyboard-backlight: "0"
     - $device-name: "vayne"
-      $bluetooth-device: "{{$device-name}}"
       skus:
         - $sku-id: 0x3a67
           config: *convertible_device_config
diff --git a/overlay-sarien/chromeos-base/chromeos-bsp-sarien/chromeos-bsp-sarien-9999.ebuild b/overlay-sarien/chromeos-base/chromeos-bsp-sarien/chromeos-bsp-sarien-9999.ebuild
index b804625..8a049cc 100644
--- a/overlay-sarien/chromeos-base/chromeos-bsp-sarien/chromeos-bsp-sarien-9999.ebuild
+++ b/overlay-sarien/chromeos-base/chromeos-bsp-sarien/chromeos-bsp-sarien-9999.ebuild
@@ -47,7 +47,6 @@
 	dosbin "${FILESDIR}/board_hardware_features"
 
 	unibuild_install_audio_files
-	unibuild_install_bluetooth_files
 
 	# Arcada use Wacom touch screen with different firmware to support
 	# different panels. As a result, we need a way to identify the correct
diff --git a/overlay-sarien/chromeos-base/chromeos-config-bsp-sarien/files/model.yaml b/overlay-sarien/chromeos-base/chromeos-config-bsp-sarien/files/model.yaml
index 9aedbe7..bbb7cc1 100644
--- a/overlay-sarien/chromeos-base/chromeos-config-bsp-sarien/files/model.yaml
+++ b/overlay-sarien/chromeos-base/chromeos-config-bsp-sarien/files/model.yaml
@@ -53,11 +53,6 @@
         # EQ/DRC DSP configuration file
         - source: "{{$audio-device-name}}/audio/cras-config/dsp.ini"
           destination: "{{$cras_root}}/{{cras-config-dir}}/dsp.ini"
-  $bluetooth-device: "common"
-  bluetooth:
-    config:
-      build-path: "{{$bluetooth-device}}/bluetooth/main.conf"
-      system-path: "/etc/bluetooth/{{$bluetooth-device}}/main.conf"
   test-label: "{{$device-name}}"
 
 sarien-config: &sarien-config