diff --git a/nixosModules/clanCore/metadata.nix b/nixosModules/clanCore/metadata.nix
index 01df49928..748d2b076 100644
--- a/nixosModules/clanCore/metadata.nix
+++ b/nixosModules/clanCore/metadata.nix
@@ -54,6 +54,26 @@ in
         "name"
       ]
     )
+    (lib.mkRenamedOptionModule
+      [ "clan" "core" "machineDescription" ]
+      [
+        "clan"
+        "core"
+        "settings"
+        "machine"
+        "description"
+      ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "clan" "core" "machineIcon" ]
+      [
+        "clan"
+        "core"
+        "settings"
+        "machine"
+        "icon"
+      ]
+    )
   ];
   options.clan.core = {
     settings = mkOption {
@@ -102,6 +122,20 @@ in
                     the name of the machine
                   '';
                 };
+                icon = lib.mkOption {
+                  type = lib.types.nullOr lib.types.path;
+                  default = null;
+                  description = ''
+                    the location of the machine icon
+                  '';
+                };
+                description = lib.mkOption {
+                  type = lib.types.nullOr lib.types.str;
+                  default = null;
+                  description = ''
+                    the description of the machine
+                  '';
+                };
               };
             };
           };
@@ -109,20 +143,8 @@ in
       };
     };
 
-    machineIcon = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      description = ''
-        the location of the machine icon
-      '';
-    };
-    machineDescription = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-      description = ''
-        the description of the machine
-      '';
-    };
+    # TODO: Move this into settings.clanPkgs ?
+    # This could also be part of the public interface to allow users to override the internal packages
     clanPkgs = lib.mkOption {
       defaultText = "self.packages.${pkgs.system}";
       internal = true;
diff --git a/nixosModules/clanCore/vm.nix b/nixosModules/clanCore/vm.nix
index 2ad5b1045..b12277b64 100644
--- a/nixosModules/clanCore/vm.nix
+++ b/nixosModules/clanCore/vm.nix
@@ -251,9 +251,9 @@ in
     # for clan vm inspect
     clan.core.vm.inspect = {
       clan_name = config.clan.core.settings.name;
-      machine_icon = config.clan.core.machineIcon or config.clan.core.settings.icon;
+      machine_icon = config.clan.core.settings.machine.icon or config.clan.core.settings.icon;
       machine_name = config.clan.core.settings.machine.name;
-      machine_description = config.clan.core.machineDescription;
+      machine_description = config.clan.core.settings.machine.description;
       memory_size = config.clan.virtualisation.memorySize;
       inherit (config.clan.virtualisation) cores graphics waypipe;
     };