diff --git a/deployment/data-model.nix b/deployment/data-model.nix
index 81738e45..773c0f91 100644
--- a/deployment/data-model.nix
+++ b/deployment/data-model.nix
@@ -18,24 +18,31 @@ let
       _class = "nixos";
     };
   };
-  runtime-environment = attrTag {
-    nixos = mkOption {
-      type = submoduleWith {
-        modules = [
-          {
-            options = {
-              module = mkOption {
-                description = "The NixOS module of the run-time environment";
-                type = deferredModule;
-                default = config.runtime-configurations.nixos;
-                readOnly = true;
-              };
-            };
-          }
-        ];
-      };
-    };
-  };
+  runtime-environment = attrTag (
+    mapAttrs
+      (
+        name: options:
+        mkOption {
+          type = submoduleWith {
+            modules = [
+              {
+                options = options // {
+                  module = mkOption {
+                    description = "The NixOS module of the run-time environment";
+                    type = deferredModule;
+                    default = config.runtime-configurations.${name};
+                    readOnly = true;
+                  };
+                };
+              }
+            ];
+          };
+        }
+      )
+      {
+        nixos = { };
+      }
+  );
   application = submoduleWith {
     description = "A Fediversity application";
     modules = [