diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
new file mode 100644
index 00000000000..08559cc2a16
--- /dev/null
+++ b/modules/misc/deployment.nix
@@ -0,0 +1,23 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+{
+  options = {
+
+    deployment = mkOption {
+      description = ''
+        This option captures various custom attributes related to the configuration of the system, which
+        are not directly used for building a system configuration. Usually these attributes
+        are used by external tooling, such as the nixos-deploy-network tool or the Disnix Avahi
+        publisher.
+      '';
+      default = {};
+      example = {
+        description = "My production machine";
+	hostname = "my.test.org";
+	country = "NL";
+      };
+    };
+  };
+}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 1364b28182d..8c927aa6142 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -24,6 +24,7 @@
   ./installer/tools/tools.nix
   ./misc/assertions.nix
   ./misc/check-config.nix
+  ./misc/deployment.nix
   ./misc/ids.nix
   ./misc/locate.nix
   ./misc/nixpkgs.nix