diff --git a/flake.nix b/flake.nix
index 0f07d86..a662872 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,6 @@
   outputs = { self, nixpkgs, ... }@inputs: {
     nixosModules = {
       ezpassthru = import ./modules/ezpassthru.nix;
-      ezvahi = import ./modules/ezvahi.nix;
       ezwg = import ./modules/ezwg.nix;
       kiosk = import ./modules/kiosk.nix;
       fuckingprint = import ./modules/fuckingprint.nix;
diff --git a/modules/default.nix b/modules/default.nix
index 4e315b7..d0a3f61 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./ezvahi.nix
     ./ezwg.nix
     ./kiosk.nix
     ./ezpassthru.nix
diff --git a/modules/ezvahi.nix b/modules/ezvahi.nix
deleted file mode 100644
index 88dc92d..0000000
--- a/modules/ezvahi.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-  cfg = config.services.ezvahi;
-in
-{
-  options.services.ezvahi.enable = mkEnableOption "Enable simple Avahi config";
-
-  config = mkIf cfg.enable {
-    services.avahi = {
-      enable = true;
-      nssmdns = true;
-      publish = {
-        enable = true;
-        addresses = true;
-        domain = true;
-        workstation = true;
-        userServices = true;
-      };
-    };
-  };
-}
diff --git a/modules/fuckingprint.nix b/modules/fuckingprint.nix
index 4a9ed0f..b49ed34 100644
--- a/modules/fuckingprint.nix
+++ b/modules/fuckingprint.nix
@@ -9,8 +9,6 @@ in
   options.fuckingprint.enable = mkEnableOption "Make my fucking printer work";
 
   config = mkIf cfg.enable {
-    services.ezvahi.enable = lib.mkDefault true;
-
     # Enable CUPS and SANE for printing and scanning
     services.printing.enable = true;
     services.printing.browsing = true;
diff --git a/modules/workstation.nix b/modules/workstation.nix
index dcc0a9a..5ac838f 100644
--- a/modules/workstation.nix
+++ b/modules/workstation.nix
@@ -20,6 +20,11 @@ in
   };
 
   config = mkIf cfg.enable {
+    services.avahi = {
+      enable = true;
+      nssmdns = true;
+    };
+
     services.ezpw.enable = lib.mkDefault true;
 
     security.pam.services = {