diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/router/isis.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/router/isis.j2
index 9ea51d2e313c69e593a60a41abe5d7ae251dc7f9..af18884dd655990b2fe1fddef49b515a87ce1b2c 100644
--- a/geant/gap_ansible/roles/bc_templates/routers/nokia/router/isis.j2
+++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/router/isis.j2
@@ -12,6 +12,12 @@
     <system-id>{{ iso_system_id }}</system-id>
     <traffic-engineering>true</traffic-engineering>
     <area-address>{{ geant_iso_area_id }}</area-address>
+  {% if router_role == 'pe' %}
+    <multicast-import>
+        <ipv4>true</ipv4>
+        <ipv6>true</ipv6>
+    </multicast-import>
+  {% endif %}
     <overload-on-boot>
         <timeout>300</timeout>
     </overload-on-boot>
diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/router/p_to_pe_router_base.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/router/p_to_pe_router_base.j2
index 621d83484decf181c384af1bf5a02d8b7a79921b..2247af90802fb05d797257b7c34163d8ef849cd0 100644
--- a/geant/gap_ansible/roles/bc_templates/routers/nokia/router/p_to_pe_router_base.j2
+++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/router/p_to_pe_router_base.j2
@@ -9,5 +9,6 @@
             {% include 'router/flowspec.j2' %}
             {% include 'router/ldp.j2' %}
             {% include 'router/rpki.j2' %}
+            {% include 'router/isis.j2' %}
        </router>
 
diff --git a/geant/gap_ansible/roles/bc_templates/routers/nokia/system/security/snmp.j2 b/geant/gap_ansible/roles/bc_templates/routers/nokia/system/security/snmp.j2
index 2a0f27976639d2b5e270a287b8899c543fb61796..8d7dd84766910b37c2217b648eddafaccbd3749e 100644
--- a/geant/gap_ansible/roles/bc_templates/routers/nokia/system/security/snmp.j2
+++ b/geant/gap_ansible/roles/bc_templates/routers/nokia/system/security/snmp.j2
@@ -20,7 +20,9 @@
           {% endif %}
             <access-permissions>r</access-permissions>
             <version>{{ community.version | default('v2c') }}</version>
+            {% if community.acl_name is defined %}
             <source-access-list>{{ community.acl_name }}</source-access-list>
+            {% endif %}
           </community>
         {% endfor %}