diff --git a/roles/bluetooth/tasks/install.yml b/roles/bluetooth/tasks/install.yml
index cac7d729b..fc52f72c0 100644
--- a/roles/bluetooth/tasks/install.yml
+++ b/roles/bluetooth/tasks/install.yml
@@ -3,13 +3,15 @@
     path: /boot/firmware/usercfg.txt
     line: "enable_uart=0"
     state: present
-  when: is_ubuntu and rpi_model != "none"
+  when: rpi_model != "none" and is_ubuntu and (ansible_distribution_version is version('20.10', '<'))
+  #when: rpi_model != "none" and is_ubuntu and (ansible_distribution_release == "focal")
+  # 2020-10-27 #2585: Ubuntu Desktop 20.10 has no /boot/firmware/usercfg.txt
 
 - name: Install pi-bluetooth package on Ubuntu
   package:
     name: pi-bluetooth
     state: present
-  when: is_ubuntu and rpi_model != "none"
+  when: rpi_model != "none" and is_ubuntu
 
 - name: Install bluetooth packages
   package: