diff --git a/legacy/modules/avahi.nix b/legacy/modules/avahi.nix
deleted file mode 100644
index efdbeed..0000000
--- a/legacy/modules/avahi.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-    publish = {
-      enable = true;
-      addresses = true;
-      workstation = true;
-      userServices = true;
-    };
-  };
-}
diff --git a/machines/serverle/configuration.nix b/machines/serverle/configuration.nix
index d5f2dcc..21f3358 100644
--- a/machines/serverle/configuration.nix
+++ b/machines/serverle/configuration.nix
@@ -8,7 +8,6 @@
     ./syncthing.nix
     ./system.nix
     ./wifi.nix
-    ../../legacy/modules/avahi.nix
     ../../legacy/modules/webapps/bazarr.nix
     ../../legacy/modules/webapps/prowlarr.nix
     ../../legacy/modules/webapps/radarr.nix
diff --git a/machines/thinkman/configuration.nix b/machines/thinkman/configuration.nix
index aec12eb..61462d9 100644
--- a/machines/thinkman/configuration.nix
+++ b/machines/thinkman/configuration.nix
@@ -7,7 +7,6 @@
     ./system.nix
     ../../legacy/modules/3d-design.nix
     ../../legacy/modules/android.nix
-    ../../legacy/modules/avahi.nix
     ../../legacy/modules/bluetooth-audio.nix
     ../../legacy/modules/clean.nix
     ../../legacy/modules/desktop-default.nix
diff --git a/modules/system/avahi/default.nix b/modules/system/avahi/default.nix
new file mode 100644
index 0000000..beb8f93
--- /dev/null
+++ b/modules/system/avahi/default.nix
@@ -0,0 +1,23 @@
+# avahi related settings
+{ config, inputs, lib, options, pkgs, ... }:
+let
+  cfg = config.my.system.avahi;
+in
+{
+  options.my.system.avahi = with lib; {
+    enable = mkEnableOption "avahi configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.avahi = {
+      enable = true;
+      nssmdns = true;
+      publish = {
+        enable = true;
+        addresses = true;
+        workstation = true;
+        userServices = true;
+      };
+    };
+  };
+}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index ab61515..59db7c8 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./avahi
     ./docker
     ./podman
   ];