diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2
index 02ae6e3d4d26edb2a72f731d43c2c80947e59cec..86e6c990d5b316d047190e13b24796007427f8d5 100644
--- a/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2
+++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/filters/fw_filters.j2
@@ -60,28 +60,6 @@
           </entry>
           {% set ns3.entry_id = ns3.entry_id + 10 %}
         {% endif %}
-        {# This is to cover CPM-ipv6 ND case where dst_prefix_list is defined, but not src_prefix_list #}
-        {% if term.from.protocol == "ipv6-icmp" and term.from.dst_prefix_list is defined %}
-          {% for dst_prefix_list_item in term.from.dst_prefix_list %}
-          <entry>
-            <entry-id>{{ ns3.entry_id }}</entry-id>
-            <description>{{ term.name }}</description>
-            {% if term.log is defined %}
-            <log>{{ term.log }}</log>
-            {% endif %}
-            <match>
-              <next-header>{{ term.from.protocol }}</next-header>
-              <dst-ip>
-              <ipv6-prefix-list>{{term.from.dst_prefix_list[loop.index0]}}</ipv6-prefix-list>
-              </dst-ip>
-            </match>
-            <action>
-              <{{ term.action }}></{{ term.action }}>
-            </action>
-          </entry>
-          {% set ns3.entry_id = ns3.entry_id + 10 %}
-          {% endfor %}
-        {% endif %}
         {# Generic ICMP filters with ICMP types #}
         {% if (term.from.protocol == "icmp" or term.from.protocol == "ipv6-icmp") %}
           {% if term.from.icmp_types is defined %}