diff --git a/hosts/pulsebert/default.nix b/hosts/pulsebert/default.nix
index a37d3483..27149374 100644
--- a/hosts/pulsebert/default.nix
+++ b/hosts/pulsebert/default.nix
@@ -6,8 +6,10 @@
 
 let
   octoprintPort = 8080;
-in {
-  imports = [ # Include the results of the hardware scan.
+in
+{
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
@@ -41,9 +43,9 @@ in {
   networking = {
     hostName = "pulsebert"; # Define your hostname.
 
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  # Per-interface useDHCP will be mandatory in the future, so this generated config
-  # replicates the default behaviour.
+    # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+    # Per-interface useDHCP will be mandatory in the future, so this generated config
+    # replicates the default behaviour.
     useDHCP = false;
     interfaces.eth0.useDHCP = true;
     interfaces.wlan0.useDHCP = true;
@@ -101,12 +103,28 @@ in {
     };
   };
 
-  services.pipewire = {
+  hardware.pulseaudio = {
     enable = true;
-    alsa.enable = true;
-    config.pipewire-pulse = lib.importJSON ./pipewire-pulse.conf.json;
-    pulse.enable = true;
+    systemWide = true;
+    tcp.enable = true;
+    tcp.anonymousClients.allowedIpRanges = [
+      "127.0.0.0/8"
+      "::1/128"
+      "fd23:42:c3d2:500::/56"
+      "172.22.99.0/24"
+      "172.20.72.0/21"
+      "2a00:8180:2c00:200::/56"
+    ];
+    zeroconf.publish.enable = true;
+    package = pkgs.pulseaudioFull;
+    extraModules = [ pkgs.pulseaudio-modules-bt ];
   };
+  #services.pipewire = {
+  #  enable = true;
+  #  alsa.enable = true;
+  #  config.pipewire-pulse = lib.importJSON ./pipewire-pulse.conf.json;
+  #  pulse.enable = true;
+  #};
   security.rtkit.enable = true;
 
   # tell Avahi to publish CUPS and PulseAudio