diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml
index 37a69e46b..462086d0f 100644
--- a/roles/4-server-options/tasks/main.yml
+++ b/roles/4-server-options/tasks/main.yml
@@ -20,7 +20,7 @@
 - name: Install Bluetooth - only on Raspberry Pi
   include_role:
     name: bluetooth
-  when: is_raspbian and bluetooth_install
+  when: not (rpi_model == "none") and bluetooth_install
 
 - name: USB_LIB
   include_role:
diff --git a/roles/bluetooth/tasks/install.yml b/roles/bluetooth/tasks/install.yml
index be7378b13..0ffe7e6ab 100644
--- a/roles/bluetooth/tasks/install.yml
+++ b/roles/bluetooth/tasks/install.yml
@@ -1,3 +1,10 @@
+- name: "Install pi-bluetooth package on Ubuntu"
+  package:
+    name:
+      - pi-bluetooth
+    state: present
+  when: is_ubuntu and not (rpi_model == "none") 
+
 - name: "Install bluetooth packages"
   package:
     name: