diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/isis-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/isis-settings.md
index 3aa7246efb3..689c3659457 100644
--- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/isis-settings.md
+++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/isis-settings.md
@@ -18,8 +18,8 @@
     | [<samp>&nbsp;&nbsp;enabled</samp>](## "isis_ti_lfa.enabled") | Boolean |  | `False` |  |  |
     | [<samp>&nbsp;&nbsp;protection</samp>](## "isis_ti_lfa.protection") | String |  |  | Valid Values:<br>- <code>link</code><br>- <code>node</code> |  |
     | [<samp>&nbsp;&nbsp;local_convergence_delay</samp>](## "isis_ti_lfa.local_convergence_delay") | Integer |  | `10000` |  | Local convergence delay in milliseconds. |
-    | [<samp>underlay_isis_authentication_mode</samp>](## "underlay_isis_authentication_mode") | String |  |  | Valid Values:<br>- <code>md5</code><br>- <code>text</code> |  |
     | [<samp>underlay_isis_authentication_key</samp>](## "underlay_isis_authentication_key") | String |  |  |  | Type-7 encrypted password. |
+    | [<samp>underlay_isis_authentication_mode</samp>](## "underlay_isis_authentication_mode") | String |  |  | Valid Values:<br>- <code>md5</code><br>- <code>text</code> |  |
     | [<samp>underlay_isis_bfd</samp>](## "underlay_isis_bfd") | Boolean |  | `False` |  | Enable BFD for ISIS on all underlay links. |
     | [<samp>underlay_isis_instance_name</samp>](## "underlay_isis_instance_name") | String |  |  |  | Default -> "EVPN_UNDERLAY" for l3ls, "CORE" for mpls. |
 
@@ -50,10 +50,10 @@
 
       # Local convergence delay in milliseconds.
       local_convergence_delay: <int; default=10000>
-    underlay_isis_authentication_mode: <str; "md5" | "text">
 
     # Type-7 encrypted password.
     underlay_isis_authentication_key: <str>
+    underlay_isis_authentication_mode: <str; "md5" | "text">
 
     # Enable BFD for ISIS on all underlay links.
     underlay_isis_bfd: <bool; default=False>
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 2a7aeff0251..e4252537176 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
@@ -59944,6 +59944,11 @@
       "default": false,
       "title": "Underlay IPv6"
     },
+    "underlay_isis_authentication_key": {
+      "type": "string",
+      "description": "Type-7 encrypted password.",
+      "title": "Underlay ISIS Authentication Key"
+    },
     "underlay_isis_authentication_mode": {
       "type": "string",
       "enum": [
@@ -59952,11 +59957,6 @@
       ],
       "title": "Underlay ISIS Authentication Mode"
     },
-    "underlay_isis_authentication_key": {
-      "type": "string",
-      "description": "Type-7 encrypted password.",
-      "title": "Underlay ISIS Authentication Key"
-    },
     "underlay_isis_bfd": {
       "type": "boolean",
       "default": false,
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 c9404613ceb..8a36970bd69 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
@@ -3888,6 +3888,11 @@ keys:
       '
     type: bool
     default: false
+  underlay_isis_authentication_key:
+    documentation_options:
+      table: isis-settings
+    type: str
+    description: Type-7 encrypted password.
   underlay_isis_authentication_mode:
     documentation_options:
       table: isis-settings
@@ -3895,11 +3900,6 @@ keys:
     valid_values:
     - md5
     - text
-  underlay_isis_authentication_key:
-    documentation_options:
-      table: isis-settings
-    type: str
-    description: Type-7 encrypted password.
   underlay_isis_bfd:
     documentation_options:
       table: isis-settings
diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication_key.yml b/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication_key.yml
new file mode 100644
index 00000000000..8ac2a73514e
--- /dev/null
+++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication_key.yml
@@ -0,0 +1,13 @@
+# Copyright (c) 2023-2024 Arista Networks, Inc.
+# Use of this source code is governed by the Apache License 2.0
+# that can be found in the LICENSE file.
+# yaml-language-server: $schema=../../../../plugins/plugin_utils/schema/avd_meta_schema.json
+# Line above is used by RedHat's YAML Schema vscode extension
+# Use Ctrl + Space to get suggestions for every field. Autocomplete will pop up after typing 2 letters.
+type: dict
+keys:  
+  underlay_isis_authentication_key:
+    documentation_options:
+      table: isis-settings
+    type: str
+    description: Type-7 encrypted password.
diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication.yml b/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication_mode.yml
similarity index 79%
rename from ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication.yml
rename to ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication_mode.yml
index 09a37df2fca..ccf922493fd 100644
--- a/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication.yml
+++ b/ansible_collections/arista/avd/roles/eos_designs/schemas/schema_fragments/underlay_isis_authentication_mode.yml
@@ -13,8 +13,3 @@ keys:
     valid_values:
       - md5
       - text
-  underlay_isis_authentication_key:
-    documentation_options:
-      table: isis-settings
-    type: str
-    description: Type-7 encrypted password.