diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-sflow-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-sflow-settings.md
index d2b272b774d..e5e308d271a 100644
--- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-sflow-settings.md
+++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/management-sflow-settings.md
@@ -1,3 +1,8 @@
+<!--
+  ~ Copyright (c) 2023 Arista Networks, Inc.
+  ~ Use of this source code is governed by the Apache License 2.0
+  ~ that can be found in the LICENSE file.
+  -->
 === "Table"
 
     | Variable | Type | Required | Default | Value Restrictions | Description |
diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json
index 384861d49f4..a3c2bb2757a 100644
--- a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json
+++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json
@@ -15041,6 +15041,27 @@
           },
           "title": "Radius"
         },
+        "sflow": {
+          "type": "object",
+          "description": "sFlow source-interfaces.",
+          "properties": {
+            "mgmt_interface": {
+              "type": "boolean",
+              "description": "Configure a sFlow source-interface with the interface set by `mgmt_interface` and the VRF set by `mgmt_interface_vrf`.\n`mgmt_interface` is typically the out-of-band Management interface, and can be set under the node settings, platform settings or as a group/host var.",
+              "title": "Management Interface"
+            },
+            "inband_mgmt_interface": {
+              "type": "boolean",
+              "description": "Configure a sFlow source-interface with the interface set by `inband_mgmt_interface` and the VRF set by `inband_mgmt_vrf`.\n`inband_mgmt_interface` is typically a loopback or SVI interface, and can be set under the node settings.",
+              "title": "Inband Management Interface"
+            }
+          },
+          "additionalProperties": false,
+          "patternProperties": {
+            "^_.+$": {}
+          },
+          "title": "Sflow"
+        },
         "snmp": {
           "type": "object",
           "description": "SNMP local-interfaces.",
diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml
index dbb94e9d146..b6d8c397ba7 100644
--- a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml
+++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.schema.yml
@@ -2509,14 +2509,6 @@ keys:
 
               `inband_mgmt_interface` is typically a loopback or SVI interface, and
               can be set under the node settings.'
-      snmp:
-        type: dict
-        description: SNMP local-interfaces.
-        keys:
-          mgmt_interface:
-            type: bool
-            description: 'Configure a SNMP local-interface with the interface set
-              by `mgmt_interface` for the VRF set by `mgmt_interface_vrf`.
       sflow:
         type: dict
         description: sFlow source-interfaces.
@@ -2531,11 +2523,28 @@ keys:
               var.'
           inband_mgmt_interface:
             type: bool
-            description: 'Configure a SNMP local-interface with the interface set
-              by `inband_mgmt_interface` for the VRF set by `inband_mgmt_vrf`.
             description: 'Configure a sFlow source-interface with the interface set
               by `inband_mgmt_interface` and the VRF set by `inband_mgmt_vrf`.
 
+              `inband_mgmt_interface` is typically a loopback or SVI interface, and
+              can be set under the node settings.'
+      snmp:
+        type: dict
+        description: SNMP local-interfaces.
+        keys:
+          mgmt_interface:
+            type: bool
+            description: 'Configure a SNMP local-interface with the interface set
+              by `mgmt_interface` for the VRF set by `mgmt_interface_vrf`.
+
+              `mgmt_interface` is typically the out-of-band Management interface,
+              and can be set under the node settings, platform settings or as a group/host
+              var.'
+          inband_mgmt_interface:
+            type: bool
+            description: 'Configure a SNMP local-interface with the interface set
+              by `inband_mgmt_interface` for the VRF set by `inband_mgmt_vrf`.
+
               `inband_mgmt_interface` is typically a loopback or SVI interface, and
               can be set under the node settings.'
       ssh_client: