diff --git a/geant/gap_ansible/roles/base_config/templates/routers/nokia/system/security/snmp.j2 b/geant/gap_ansible/roles/base_config/templates/routers/nokia/system/security/snmp.j2
index 3754f395e81eb4756690ca6b68df89b629b51cae..2a0f27976639d2b5e270a287b8899c543fb61796 100644
--- a/geant/gap_ansible/roles/base_config/templates/routers/nokia/system/security/snmp.j2
+++ b/geant/gap_ansible/roles/base_config/templates/routers/nokia/system/security/snmp.j2
@@ -1,4 +1,16 @@
         <snmp>
+        {% for acl in nokia_snmp_acls %}
+          <source-access-list xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
+            <list-name>{{ acl.acl_name }}</list-name>
+          {% for entry in acl.acl_entries %}
+            <source-host>
+              <host-name>{{ entry.hostname }}</host-name>
+              <address>{{ entry.address }}</address>
+            </source-host>
+          {% endfor %}
+          </source-access-list>
+        {% endfor %}
+
         {% for community in nokia_snmp_communities %}
           <community xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
           {% if community.hash2 is defined %}
@@ -10,16 +22,8 @@
             <version>{{ community.version | default('v2c') }}</version>
             <source-access-list>{{ community.acl_name }}</source-access-list>
           </community>
-          <source-access-list xmlns="urn:nokia.com:sros:ns:yang:sr:conf" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nokia-attr="urn:nokia.com:sros:ns:yang:sr:attributes" alu:operation="replace">
-            <list-name>{{ community.acl_name }}</list-name>
-          {% for entry in community.acl_entries %}
-            <source-host>
-              <host-name>{{ entry.hostname }}</host-name>
-              <address>{{ entry.address }}</address>
-            </source-host>
-          {% endfor %}
-          </source-access-list>
         {% endfor %}
+
         {% if nokia_snmp_views is defined %}
           {% for view in nokia_snmp_views %}
           <view alu:operation="replace">
@@ -34,15 +38,6 @@
             <group>{{ view.name }}</group>
             <source-access-list>{{ view.acl_name }}</source-access-list>
           </usm-community>
-          <source-access-list alu:operation="replace">
-            <list-name>{{ view.acl_name }}</list-name>
-            {% for entry in view.acl_entries %}
-            <source-host>
-              <host-name>{{ entry.hostname }}</host-name>
-              <address>{{ entry.address }}</address>
-            </source-host>
-            {% endfor %}
-          </source-access-list>
           <access alu:operation="replace">
             <group>{{ view.name }}</group>
             <context></context>