diff --git a/docs/nix/options/flake-module.nix b/docs/nix/options/flake-module.nix
index 2e3e7e4a3..ed70300d9 100644
--- a/docs/nix/options/flake-module.nix
+++ b/docs/nix/options/flake-module.nix
@@ -121,6 +121,7 @@
                   roleName: roleSettingsModule:
                   mkOption {
                     type = types.submodule {
+                      _file = "docs flake-module";
                       imports = [
                         { _module.args = { inherit clanLib; }; }
                         (import ../../../lib/inventory/build-inventory/roles-interface.nix {
@@ -148,7 +149,10 @@
       mkScope = name: modules: {
         inherit name;
         modules = [
-          { _module.args = { inherit clanLib; }; }
+          {
+            _module.args = { inherit clanLib; };
+            _file = "docs mkScope";
+          }
           { noInstanceOptions = true; }
           ../../../lib/inventory/build-inventory/interface.nix
         ] ++ mapAttrsToList fakeInstanceOptions modules;
diff --git a/lib/inventory/build-inventory/builder/default.nix b/lib/inventory/build-inventory/builder/default.nix
index 01e7d6b6b..c25ea7057 100644
--- a/lib/inventory/build-inventory/builder/default.nix
+++ b/lib/inventory/build-inventory/builder/default.nix
@@ -170,6 +170,7 @@ in
               getRoleFile = role: builtins.seq role inventory.modules.${serviceName} + "/roles/${role}.nix";
             in
             {
+              _file = "inventory/builder.nix";
               _module.args = {
                 inherit
                   resolveTags
diff --git a/lib/inventory/build-inventory/interface.nix b/lib/inventory/build-inventory/interface.nix
index 2680ada3d..6807cdca6 100644
--- a/lib/inventory/build-inventory/interface.nix
+++ b/lib/inventory/build-inventory/interface.nix
@@ -421,6 +421,7 @@ in
                           types.submodule {
                             imports = [
                               {
+                                _file = "inventory/interface";
                                 _module.args = {
                                   inherit clanLib;
                                 };
diff --git a/lib/inventory/default.nix b/lib/inventory/default.nix
index e89f5147a..894116451 100644
--- a/lib/inventory/default.nix
+++ b/lib/inventory/default.nix
@@ -6,6 +6,7 @@ in
   inherit (services) evalClanService mapInstances resolveModule;
   inherit (import ./build-inventory { inherit lib clanLib; }) buildInventory;
   interface = {
+    _file = "inventory/default.nix";
     imports = [
       ./build-inventory/interface.nix
     ];
diff --git a/lib/inventory/distributed-service/tests/default.nix b/lib/inventory/distributed-service/tests/default.nix
index 2a4daaa8c..cf4fcb39b 100644
--- a/lib/inventory/distributed-service/tests/default.nix
+++ b/lib/inventory/distributed-service/tests/default.nix
@@ -15,9 +15,7 @@ let
       modules = [
         clanLib.inventory.interface
         {
-          _module.args = {
-            inherit clanLib;
-          };
+          _file = "test file";
           tags.all = [ ];
           tags.nixos = [ ];
           tags.darwin = [ ];
diff --git a/lib/inventory/frontmatter/default.nix b/lib/inventory/frontmatter/default.nix
index 83fda98e3..383779b99 100644
--- a/lib/inventory/frontmatter/default.nix
+++ b/lib/inventory/frontmatter/default.nix
@@ -56,7 +56,9 @@ let
         {
           constraints.imports = [
             (lib.modules.importApply ../constraints {
+              resolvedRoles = { };
               moduleName = "{moduleName}";
+              instanceName = "{instanceName}";
               allRoles = [ "{roleName}" ];
             })
           ];
diff --git a/lib/modules/clan/interface.nix b/lib/modules/clan/interface.nix
index e4483fd9e..d96841ee2 100644
--- a/lib/modules/clan/interface.nix
+++ b/lib/modules/clan/interface.nix
@@ -100,7 +100,10 @@ in
     inventory = lib.mkOption {
       type = types.submodule {
         imports = [
-          { _module.args = { inherit clanLib; }; }
+          {
+            _module.args = { inherit clanLib; };
+            _file = "clan interface";
+          }
           ../../inventory/build-inventory/interface.nix
         ];
       };