diff --git a/hosts/cadmium/configuration.nix b/hosts/cadmium/configuration.nix
index 01e405d..0024313 100644
--- a/hosts/cadmium/configuration.nix
+++ b/hosts/cadmium/configuration.nix
@@ -37,10 +37,6 @@
 
   programs.mtr.enable = true;
 
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-  services.ofono.enable = true;
-
   services.udisks2.enable = true;
 
   # udevadm info --name /dev/foo --query all
@@ -52,6 +48,7 @@
 
   jalr = {
     bootloader = "systemd-boot";
+    bluetooth.enable = true;
     uefi.enable = true;
     gui.enable = true;
     workstation.enable = true;
diff --git a/hosts/hafnium/configuration.nix b/hosts/hafnium/configuration.nix
index 76cf283..d8f7647 100644
--- a/hosts/hafnium/configuration.nix
+++ b/hosts/hafnium/configuration.nix
@@ -42,14 +42,12 @@
 
   programs.mtr.enable = true;
 
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-  services.ofono.enable = true;
 
   services.udisks2.enable = true;
 
   jalr = {
     bootloader = "systemd-boot";
+    bluetooth.enable = true;
     uefi.enable = true;
     gui.enable = true;
     workstation.enable = true;
diff --git a/hosts/jalr-t520/configuration.nix b/hosts/jalr-t520/configuration.nix
index f7b4a62..48be9b1 100644
--- a/hosts/jalr-t520/configuration.nix
+++ b/hosts/jalr-t520/configuration.nix
@@ -23,12 +23,8 @@
   programs.mtr.enable = true;
   programs.wireshark.enable = true;
 
-  hardware.bluetooth.enable = true;
-
   hardware.sane.enable = true;
 
-  services.blueman.enable = true;
-
   services.udisks2.enable = true;
 
   services.avahi.enable = true;
@@ -46,6 +42,7 @@
 
   jalr = {
     bootloader = "grub2";
+    bluetooth.enable = true;
     gui.enable = true;
     workstation.enable = true;
     sdr.enable = true;
diff --git a/modules/bluetooth.nix b/modules/bluetooth.nix
new file mode 100644
index 0000000..2e71330
--- /dev/null
+++ b/modules/bluetooth.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.jalr;
+in
+{
+  options.jalr = {
+    bluetooth.enable = pkgs.lib.mkEnableOption "Enable bluetooth" // { default = false; };
+  };
+  config = lib.mkIf cfg.uefi.enable {
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+    services.ofono.enable = true;
+    services.upower.enable = true;
+  };
+}
+
diff --git a/modules/default.nix b/modules/default.nix
index 7ecebb6..732071f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -10,6 +10,7 @@
     ../pkgs/modules.nix
     ./autologin.nix
     ./aws.nix
+    ./bluetooth.nix
     ./bootloader
     ./dji-goggles.nix
     ./dnsmasq.nix