diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index 7d623d3..4c323bf 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -86,7 +86,7 @@
     pop-icon-theme
   ];
 
-  media.enableAll = true;
+  modules.media.enableAll = true;
 
   system.stateVersion = "24.05";
 }
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index efaf08f..f283275 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -131,7 +131,7 @@
 
   xdg.portal.enable = true;
 
-  media.enableAll = true;
+  modules.media.enableAll = true;
   # Configure console keymap
   console.keyMap = "fr";
 
diff --git a/options/media.nix b/options/media.nix
index 359bf15..ff7eb59 100644
--- a/options/media.nix
+++ b/options/media.nix
@@ -5,14 +5,14 @@
   ...
 }:
 let
-  cfg = config.media;
+  cfg = config.modules.media;
   mkMedia = defPackages: {
     enable = lib.mkOption { default = cfg.enableAll; };
     packages = lib.mkOption { default = defPackages; };
   };
 in
 {
-  options.media = {
+  options.modules.media = {
     enableAll = lib.mkEnableOption "";
     audio = mkMedia [
       pkgs.feishin