diff --git a/lib/inventory/distributed-service/inventory-adapter.nix b/lib/inventory/distributed-service/inventory-adapter.nix
index e3a90d440..1aa157b6a 100644
--- a/lib/inventory/distributed-service/inventory-adapter.nix
+++ b/lib/inventory/distributed-service/inventory-adapter.nix
@@ -114,7 +114,9 @@ in
               };
             in
             # instances.<instanceName>.roles.<roleName> =
-            {
+            # Remove "tags", they are resolved into "machines"
+            (removeAttrs role [ "tags" ])
+            // {
               machines = lib.genAttrs resolvedMachines.machines (
                 machineName:
                 let
@@ -136,10 +138,6 @@ in
                   };
                 }
               );
-              # Maps to settings for the role.
-              # In other words this sets the following path of a clan.service module:
-              # instances.<instanceName>.roles.<roleName>.settings
-              settings = role.settings;
             }
           ) instance.roles;
         in