diff --git a/machines/bakunin/configuration.nix b/machines/bakunin/configuration.nix
index b57bc31d..86b4166e 100644
--- a/machines/bakunin/configuration.nix
+++ b/machines/bakunin/configuration.nix
@@ -67,16 +67,13 @@
   networking.hostName = "bakunin";
   networking.networkmanager.enable = true;
 
-  hardware.pulseaudio = {
-    enable = true;
-    zeroconf.discovery.enable = true;
-    extraConfig = ''
-      load-module module-zeroconf-discover
-    '';
-  };
-
-  services.avahi = {
+  security.rtkit.enable = true;
+  services.pipewire = {
     enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    systemWide = true;
   };
 
 
diff --git a/machines/louise/configuration.nix b/machines/louise/configuration.nix
index 146a5fa5..913a1af8 100644
--- a/machines/louise/configuration.nix
+++ b/machines/louise/configuration.nix
@@ -67,16 +67,13 @@
   networking.hostName = "louise";
   networking.networkmanager.enable = true;
 
-  hardware.pulseaudio = {
-    enable = true;
-    zeroconf.discovery.enable = true;
-    extraConfig = ''
-      load-module module-zeroconf-discover
-    '';
-  };
-
-  services.avahi = {
+  security.rtkit.enable = true;
+  services.pipewire = {
     enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    systemWide = true;
   };