diff --git a/flake.nix b/flake.nix
index 8b4656b3..dc2037f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -353,7 +353,12 @@
               format = metadata.format or "iso";
               extraModules = [
                 ({ lib, ... }: {
-                  networking.hostName = lib.mkOverride 2000 host;
+                  config = lib.mkMerge [
+                    { networking.hostName = metadata.hostname or host; }
+
+                    (lib.mkIf (metadata ? domain)
+                      { networking.domain = metadata.domain; })
+                  ];
                 })
                 hostSharedConfig
                 ./hosts/${host}