diff --git a/modules/networking/default.nix b/modules/networking/default.nix
index a565b94..36c0d49 100644
--- a/modules/networking/default.nix
+++ b/modules/networking/default.nix
@@ -12,8 +12,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    users.extraUsers.${config.eboskma.var.mainUser}.extraGroups = [ "networkmanager" ];
-
     environment.systemPackages = with pkgs; [
       nmap
       nmap-formatter
@@ -21,11 +19,14 @@ in
 
     services.avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
+      nssmdns6 = config.networking.enableIPv6;
       publish = {
         enable = true;
         domain = true;
+        hinfo = true;
         userServices = true;
+        workstation = true;
       };
     };
   };