diff --git a/nodes/hosts/common/system/bluetooth.nix b/nodes/hosts/common/system/bluetooth.nix
index ac8a783..3bd09bb 100644
--- a/nodes/hosts/common/system/bluetooth.nix
+++ b/nodes/hosts/common/system/bluetooth.nix
@@ -1,13 +1,29 @@
-{ ... }: {
+{ pkgs, ... }: {
   hardware.bluetooth = {
     enable = true; # enables support for Bluetooth
+    package = pkgs.bluez-experimental;
     powerOnBoot = true; # powers up the default Bluetooth controller on boot
-    settings.General = {
-      Privacy = "device";
-      JustWorksRepairing = "always";
-      Class = "0x000100";
-      FastConnectable = true;
-    };
+    settings = {
+      LE = {
+        MinConnectionInterval = 16;
+        MaxConnectionInterval = 16;
+        ConnectionLatency = 10;
+        ConnectionSupervisionTimeout = 100;
+      };
+
+      General = {
+        Enable = "Source,Sink,Media,Socket";
+        Privacy = "device";
+        JustWorksRepairing = "always";
+        Class = "0x000100";
+        Experimental = true;
+        FastConnectable = true;
+      };
+
+      Policy = {
+        AutoEnable = true;
+      };
+    };  
   };
 }
 
diff --git a/nodes/hosts/common/system/bootloader.nix b/nodes/hosts/common/system/bootloader.nix
index 87c9e3d..3cc9415 100644
--- a/nodes/hosts/common/system/bootloader.nix
+++ b/nodes/hosts/common/system/bootloader.nix
@@ -4,7 +4,12 @@
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
+    
     kernelPackages = pkgs.linuxPackages_xanmod_stable;
+
+    extraModprobeConfig = ''
+      options bluetooth enable_ecred=1
+    '';
   };
 }