diff --git a/home-manager/roles/mpd.nix b/home-manager/roles/mpd.nix
index 3eab14ee..cceb56f8 100644
--- a/home-manager/roles/mpd.nix
+++ b/home-manager/roles/mpd.nix
@@ -6,8 +6,7 @@
       extraConfig = ''
         audio_output {
               type "pulse"
-              name "Pulseaudio"
-              server "localhost"
+              name "Pipewire"
         }
       '';
     };
diff --git a/nixos/machines/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix
index 8879b0a9..799bab28 100644
--- a/nixos/machines/apollo/configuration.nix
+++ b/nixos/machines/apollo/configuration.nix
@@ -36,15 +36,17 @@ in
         allowedIPsAsRoutes = false;
         ips = [ "${hosts.apollo-wg}/112" ];
         privateKeyFile = pkgs.privatePath "wireguard/apollo-private";
-        peers = [{
-          publicKey = wireguard.pub.hera;
-          allowedIPs = [ "::/0" ];
-          # endpoint =
-          #  "[${hosts.hera-wg-host}]:${builtins.toString wireguard.port}";
-          endpoint = "[${hosts.hera-v4}]:${builtins.toString wireguard.port}";
-          presharedKeyFile = pkgs.privatePath "wireguard/psk";
-          persistentKeepalive = 25;
-        }];
+        peers = [
+          {
+            publicKey = wireguard.pub.hera;
+            allowedIPs = [ "::/0" ];
+            # endpoint =
+            #  "[${hosts.hera-wg-host}]:${builtins.toString wireguard.port}";
+            endpoint = "[${hosts.hera-v4}]:${builtins.toString wireguard.port}";
+            presharedKeyFile = pkgs.privatePath "wireguard/psk";
+            persistentKeepalive = 25;
+          }
+        ];
         postSetup =
           [ "${pkgs.iproute}/bin/ip route add ${prefix}::/96 dev m0wire" ];
       };
@@ -65,8 +67,18 @@ in
     dconf.enable = true;
   };
 
+  security.rtkit.enable = true;
   services = {
     #teamviewer.enable = true;
+    pipewire = {
+      enable = true;
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+      pulse.enable = true;
+      media-session.enable = true;
+    };
     fwupd.enable = true;
     upower.enable = true;
     printing = {
@@ -141,7 +153,7 @@ in
       driSupport32Bit = true; # for gw2
     };
     pulseaudio = {
-      enable = true;
+      enable = false;
       support32Bit = true;
       tcp = {
         enable = true;