diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index 875fcd1..b1a3055 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -39,12 +39,6 @@
   };
 
   services.dbus.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
 
   programs = {
     dconf.enable = true;
@@ -90,8 +84,6 @@
     eza
     bat
     swaynotificationcenter
-    pipewire
-    wireplumber
   ];
 
   system.stateVersion = "24.05";
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 1ac1167..f090a62 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -149,6 +149,7 @@
   };
 
   services.gnome.gnome-keyring.enable = true;
+
   services.flatpak.enable = true;
 
   environment.variables = {
@@ -158,13 +159,6 @@
 
   security.polkit.enable = true;
 
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
diff --git a/modules/default.nix b/modules/default.nix
index ba5cbbe..f5a7f6b 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -16,6 +16,7 @@
     ./home-manager.nix
     ./system/mime.nix
     ./env.nix
-    ./printing.nix
+    ./system/printing.nix
+    ./system/audio.nix
   ];
 }
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
new file mode 100644
index 0000000..6b8bfda
--- /dev/null
+++ b/modules/system/audio.nix
@@ -0,0 +1,9 @@
+{
+  # Enables wireplumber automatically
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+}
diff --git a/modules/printing.nix b/modules/system/printing.nix
similarity index 100%
rename from modules/printing.nix
rename to modules/system/printing.nix