diff --git a/pom.xml b/pom.xml
index b298731..460af88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@
               <generateApiTests>true</generateApiTests>
               <generateApiDocumentation>true</generateApiDocumentation>
               <generateModels>true</generateModels>
-              <modelsToGenerate>entityDataType,arrayType,dateType,entityTypeRelation,objectType,nestedObjectProperty,entityTypeColumn,enumType,booleanType,entityType,integerType,openUUIDType,stringType,numberType,rangedUUIDType,valueWithLabel,entityTypeDefaultSort,errors,error,parameters,parameter,resultsetPage,queryDetails,queryIdentifier,sourceColumn,valueSourceApi,columnValues,columnValueGetter,submitQuery,contentsRequest,field,entityTypeSource,entityTypeSourceJoin,stringUUIDType</modelsToGenerate>
+              <modelsToGenerate>entityDataType,arrayType,dateType,entityTypeRelation,objectType,nestedObjectProperty,entityTypeColumn,enumType,booleanType,entityType,integerType,openUUIDType,stringType,numberType,rangedUUIDType,valueWithLabel,entityTypeDefaultSort,errors,error,parameters,parameter,resultsetPage,queryDetails,queryIdentifier,sourceColumn,valueSourceApi,columnValues,columnValueGetter,submitQuery,contentsRequest,field,entityTypeSource,entityTypeSourceJoin,stringUUIDType,entityTypeCrossTenantQueryConfig</modelsToGenerate>
               <generateModelTests>false</generateModelTests>
               <generateModelDocumentation>true</generateModelDocumentation>
               <generateSupportingFiles>true</generateSupportingFiles>
diff --git a/src/main/resources/swagger.api/schemas/entityType.json b/src/main/resources/swagger.api/schemas/entityType.json
index d49d76f..fc687da 100644
--- a/src/main/resources/swagger.api/schemas/entityType.json
+++ b/src/main/resources/swagger.api/schemas/entityType.json
@@ -43,6 +43,10 @@
         },
         "default": []
       },
+      "crossTenantQueryConfig": {
+        "description": "Cross-tenant query config for this entity type. Cross-tenant queries are not supported for entity types without this property.",
+        "$ref": "entityTypeCrossTenantQueryConfig.json"
+      },
       "defaultSort": {
         "type": "array",
         "items": {
diff --git a/src/main/resources/swagger.api/schemas/entityTypeCrossTenantQueryConfig.json b/src/main/resources/swagger.api/schemas/entityTypeCrossTenantQueryConfig.json
new file mode 100644
index 0000000..ea271ee
--- /dev/null
+++ b/src/main/resources/swagger.api/schemas/entityTypeCrossTenantQueryConfig.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "Entity Data Cross-Tenant Query Configuration",
+  "description": "Configuration for cross-tenant entity data queries",
+  "properties": {
+    "tenantIdColumn": {
+      "description": "The name of the column containing the tenant ID.",
+      "type": "string"
+    },
+    "sourceTenantIdColumn": {
+      "description": "The name of the source tenant ID of the entity.",
+      "type": "string"
+    }
+  },
+  "required": [
+    "tenantIdColumn",
+    "sourceTenantIdColumn"
+  ]
+}