diff --git a/infra/common/options.nix b/infra/common/options.nix
index d2c08c3..f2ff814 100644
--- a/infra/common/options.nix
+++ b/infra/common/options.nix
@@ -7,6 +7,10 @@ let
 in
 {
   options.fediversityVm = {
+
+    ##########################################################################
+    ## Meta
+
     name = mkOption {
       description = ''
         The name of the machine. Most of the time, this will look like `vm02XXX`
@@ -37,6 +41,9 @@ in
       '';
     };
 
+    ##########################################################################
+    ## Virtualised hardware
+
     sockets = mkOption {
       type = types.int;
       description = "The number of sockets of the VM.";
@@ -55,6 +62,9 @@ in
       default = 2048;
     };
 
+    ##########################################################################
+    ## Networking
+
     domain = mkOption {
       description = ''
         The domain hosting the machine. Most of the time, this will be either of