diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-community-lists.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-community-lists.md
index bc0bcb7e7c9..b9f826f368e 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-community-lists.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ip-community-lists.md
@@ -5,7 +5,6 @@
 - [Management](#management)
   - [Management Interfaces](#management-interfaces)
 - [Filters](#filters)
-  - [Community-lists](#community-lists)
   - [IP Community-lists](#ip-community-lists-1)
 
 ## Management
@@ -38,23 +37,6 @@ interface Management1
 
 ## Filters
 
-### Community-lists
-
-#### Community-lists Summary
-
-| Name | Action |
-| -------- | ------ |
-| TEST1 | permit 1000:1000 |
-| TEST2 | permit 2000:3000 |
-
-#### Community-lists Device Configuration
-
-```eos
-!
-ip community-list TEST1 permit 1000:1000
-ip community-list TEST2 permit 2000:3000
-```
-
 ### IP Community-lists
 
 #### IP Community-lists Summary
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-community-lists.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-community-lists.cfg
index d7285acad0e..66ce4372435 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-community-lists.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ip-community-lists.cfg
@@ -4,9 +4,6 @@ interface Management1
    vrf MGMT
    ip address 10.73.255.122/24
 !
-ip community-list TEST1 permit 1000:1000
-ip community-list TEST2 permit 2000:3000
-!
 ip community-list IP_CL_TEST1 permit 1001:1001 1002:1002
 ip community-list IP_CL_TEST1 deny 1010:1010
 ip community-list regexp IP_CL_TEST1 permit 20:*
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ip-community-lists.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ip-community-lists.yml
index 3b9cc3b6a76..542e95adfaf 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ip-community-lists.yml
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ip-community-lists.yml
@@ -1,11 +1,4 @@
 ### IP community lists ###
-
-community_lists:
-  - name: TEST1
-    action: "permit 1000:1000"
-  - name: TEST2
-    action: "permit 2000:3000"
-
 ip_community_lists:
   - name: IP_CL_TEST1
     entries:
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md
index 08a6367f44b..33c947bf39a 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/documentation/devices/host1.md
@@ -5,6 +5,8 @@
 - [Interfaces](#interfaces)
   - [Ethernet Interfaces](#ethernet-interfaces)
   - [Port-Channel Interfaces](#port-channel-interfaces)
+- [Filters](#filters)
+  - [Community-lists](#community-lists)
 
 ## Interfaces
 
@@ -135,3 +137,22 @@ interface Port-Channel5
    switchport vlan translation out 25 49
    switchport vlan translation 34 60
 ```
+
+## Filters
+
+### Community-lists
+
+#### Community-lists Summary
+
+| Name | Action |
+| -------- | ------ |
+| TEST1 | permit 1000:1000 |
+| TEST2 | permit 2000:3000 |
+
+#### Community-lists Device Configuration
+
+```eos
+!
+ip community-list TEST1 permit 1000:1000
+ip community-list TEST2 permit 2000:3000
+```
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg
index a74d8ef2bd1..81b3914c4ee 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/intended/configs/host1.cfg
@@ -53,3 +53,6 @@ interface Ethernet4
    switchport
    switchport trunk private-vlan secondary
    switchport pvlan mapping 2,3,4
+!
+ip community-list TEST1 permit 1000:1000
+ip community-list TEST2 permit 2000:3000
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/community-lists.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/community-lists.yml
new file mode 100644
index 00000000000..e1919c93c20
--- /dev/null
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen_deprecated_vars/inventory/host_vars/host1/community-lists.yml
@@ -0,0 +1,5 @@
+community_lists:
+  - name: TEST1
+    action: "permit 1000:1000"
+  - name: TEST2
+    action: "permit 2000:3000"
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/community-lists.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/community-lists.md
index a7827fea8c7..64c8f401763 100644
--- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/community-lists.md
+++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/community-lists.md
@@ -7,13 +7,16 @@
 
     | Variable | Type | Required | Default | Value Restrictions | Description |
     | -------- | ---- | -------- | ------- | ------------------ | ----------- |
-    | [<samp>community_lists</samp>](## "community_lists") | List, items: Dictionary |  |  |  |  |
+    | [<samp>community_lists</samp>](## "community_lists") <span style="color:red">deprecated</span> | List, items: Dictionary |  |  |  | <span style="color:red">This key is deprecated. Support will be removed in AVD version 6.0.0. Use <samp>ip_community_lists</samp> instead.</span> |
     | [<samp>&nbsp;&nbsp;-&nbsp;name</samp>](## "community_lists.[].name") | String | Required, Unique |  |  | Community-list Name. |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;action</samp>](## "community_lists.[].action") | String | Required |  |  | Action as string.<br>Example: "permit GSHUT 65123:123"<br> |
 
 === "YAML"
 
     ```yaml
+    # This key is deprecated.
+    # Support will be removed in AVD version 6.0.0.
+    # Use <samp>ip_community_lists</samp> instead.
     community_lists:
 
         # Community-list Name.
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/filters.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/filters.j2
index 05e96f594b9..44b9d3c6102 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/filters.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/filters.j2
@@ -18,7 +18,7 @@
 ## Filters
 {## Community-lists #}
 {%     include 'documentation/community-lists.j2' %}
-{## Community-lists, improved data model #}
+{## IP Community Lists #}
 {%     include 'documentation/ip-community-lists.j2' %}
 {## Peer Filters #}
 {%     include 'documentation/peer-filters.j2' %}
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos-intended-config.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos-intended-config.j2
index 17ff0cd1277..20fdf8be050 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos-intended-config.j2
+++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos-intended-config.j2
@@ -235,7 +235,7 @@
 {% include 'eos/priority-flow-control.j2' %}
 {# Community-lists #}
 {% include 'eos/community-lists.j2' %}
-{# Community-lists, improved data model #}
+{# IP Community Lists #}
 {% include 'eos/ip-community-lists.j2' %}
 {# IP Extended Community Lists #}
 {% include 'eos/ip-extcommunity-lists.j2' %}
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
index f0e8fb0b319..564773cd146 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
+++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
@@ -875,6 +875,10 @@ keys:
     type: list
     primary_key: name
     display_name: Community Lists (legacy model)
+    deprecation:
+      warning: true
+      remove_in_version: 6.0.0
+      new_key: ip_community_lists
     items:
       type: dict
       keys:
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/community_lists.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/community_lists.schema.yml
index a82d4963f17..f76c819b0c4 100644
--- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/community_lists.schema.yml
+++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/community_lists.schema.yml
@@ -10,6 +10,10 @@ keys:
     type: list
     primary_key: name
     display_name: Community Lists (legacy model)
+    deprecation:
+      warning: true
+      remove_in_version: 6.0.0
+      new_key: ip_community_lists
     items:
       type: dict
       keys: