diff --git a/src/main/domain/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json b/src/main/domain/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json
new file mode 100644
index 000000000..84581f84d
--- /dev/null
+++ b/src/main/domain/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json
@@ -0,0 +1,18 @@
+{
+  "packageName" : "io.fusionauth.domain",
+  "type" : "TenantManagerConfiguration",
+  "implements" : [ {
+    "type" : "Buildable",
+    "typeArguments" : [ {
+      "type" : "TenantManagerConfiguration"
+    } ]
+  } ],
+  "fields" : {
+    "attributeFormId" : {
+      "type" : "UUID"
+    },
+    "brandName" : {
+      "type" : "String"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/domain/io.fusionauth.domain.SystemConfiguration.json b/src/main/domain/io.fusionauth.domain.SystemConfiguration.json
index 0f32c1d6e..54d439a46 100644
--- a/src/main/domain/io.fusionauth.domain.SystemConfiguration.json
+++ b/src/main/domain/io.fusionauth.domain.SystemConfiguration.json
@@ -40,6 +40,9 @@
     "reportTimezone" : {
       "type" : "ZoneId"
     },
+    "tenantManagerConfiguration" : {
+      "type" : "TenantManagerConfiguration"
+    },
     "trustedProxyConfiguration" : {
       "type" : "SystemTrustedProxyConfiguration"
     },
diff --git a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json
new file mode 100644
index 000000000..67414f418
--- /dev/null
+++ b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration.json
@@ -0,0 +1,29 @@
+{
+  "className" : "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration",
+  "extends" : {
+    "className" : "java.lang.Object",
+    "type" : "Object"
+  },
+  "fields" : {
+    "attributeFormId" : {
+      "className" : "java.util.UUID",
+      "type" : "UUID"
+    },
+    "brandName" : {
+      "className" : "java.lang.String",
+      "type" : "String"
+    }
+  },
+  "imports" : [ "io.fusionauth.domain.Buildable", "java.util.UUID", "java.lang.String" ],
+  "interfaces" : [ {
+    "className" : "io.fusionauth.domain.Buildable",
+    "type" : "Buildable",
+    "typeArguments" : [ {
+      "className" : "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration",
+      "type" : "SystemConfiguration$TenantManagerConfiguration"
+    } ]
+  } ],
+  "objectType" : "Object",
+  "packageName" : "io.fusionauth.domain",
+  "type" : "SystemConfiguration$TenantManagerConfiguration"
+}
\ No newline at end of file
diff --git a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json
index 0b2451b8e..0b6b600ac 100644
--- a/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json
+++ b/src/main/domainNG/io.fusionauth.domain.SystemConfiguration.json
@@ -48,6 +48,10 @@
       "className" : "java.time.ZoneId",
       "type" : "ZoneId"
     },
+    "tenantManagerConfiguration" : {
+      "className" : "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration",
+      "type" : "SystemConfiguration$TenantManagerConfiguration"
+    },
     "trustedProxyConfiguration" : {
       "className" : "io.fusionauth.domain.SystemTrustedProxyConfiguration",
       "type" : "SystemTrustedProxyConfiguration"
@@ -65,7 +69,7 @@
       "type" : "WebhookEventLogConfiguration"
     }
   },
-  "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "java.lang.String", "io.fusionauth.domain.CORSConfiguration", "java.util.Map", "io.fusionauth.domain.SystemConfiguration$EventLogConfiguration", "java.time.ZonedDateTime", "io.fusionauth.domain.SystemConfiguration$LoginRecordConfiguration", "java.time.ZoneId", "io.fusionauth.domain.SystemTrustedProxyConfiguration", "io.fusionauth.domain.SystemConfiguration$UIConfiguration", "io.fusionauth.domain.UsageDataConfiguration", "io.fusionauth.domain.WebhookEventLogConfiguration" ],
+  "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.SystemConfiguration$AuditLogConfiguration", "java.lang.String", "io.fusionauth.domain.CORSConfiguration", "java.util.Map", "io.fusionauth.domain.SystemConfiguration$EventLogConfiguration", "java.time.ZonedDateTime", "io.fusionauth.domain.SystemConfiguration$LoginRecordConfiguration", "java.time.ZoneId", "io.fusionauth.domain.SystemConfiguration$TenantManagerConfiguration", "io.fusionauth.domain.SystemTrustedProxyConfiguration", "io.fusionauth.domain.SystemConfiguration$UIConfiguration", "io.fusionauth.domain.UsageDataConfiguration", "io.fusionauth.domain.WebhookEventLogConfiguration" ],
   "interfaces" : [ {
     "className" : "io.fusionauth.domain.Buildable",
     "type" : "Buildable",