diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2
index c3c587bbd0008dcb27c8486f2220b49c9f79f87e..363651932f9b214250456758f08c6269a8130f00 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/pe_base_config.j2
@@ -5,6 +5,7 @@
        {% include 'filters/cpm_filters.j2' %}
        {% include 'policy_options/policy_options.j2' %}
        {% include 'cflowd.j2' %}
+       {% include 'system/security/security.j2' %}
        {% include 'router/router_base.j2' %}
        {% include 'sdp_mesh.j2' %}
    </configure>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
index debe66131f3f5fdc2f40a9f2ab4331dac6e7124f..837bc54a4f4ed3c5e5602b4ab5b34a1f7401e4ec 100644
--- a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/router/bgp_neighbor.j2
@@ -4,7 +4,7 @@
                     <description>{{ neighbor.description }}</description>
                     <group>{{ neighbor.group }}</group>
                   {% if neighbor.auth_key is defined %}
-                    <authentication-key>{{ neighbor.auth_key }</authentication-key>
+                    <authentication-key>{{ neighbor.auth_key }}</authentication-key>
                   {% endif %}
                   {% if neighbor.hold_time is defined %}
                     <hold-time>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/system/security/security.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/system/security/security.j2
new file mode 100644
index 0000000000000000000000000000000000000000..431bf1e1054187bf7a804c4c1c7faa33e2b42db2
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/system/security/security.j2
@@ -0,0 +1,8 @@
+
+    <system>
+      <security>
+      {% with nokia_applications=pe_nokia_applications %}
+        {% include 'system/security/source_addresses.j2' %}
+      {% endwith %}
+      </security>
+    </system>
diff --git a/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/system/security/source_addresses.j2 b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/system/security/source_addresses.j2
new file mode 100644
index 0000000000000000000000000000000000000000..cec3327d347df48bea28de4d8b8c53a072478433
--- /dev/null
+++ b/geant/gap_ansible/roles/promote_p_to_pe/templates/routers/nokia/system/security/source_addresses.j2
@@ -0,0 +1,10 @@
+
+                <source-address>
+                   {% for application in nokia_applications %}
+                    <ipv4 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">
+                        <application>{{ application.name }}</application>
+                        <interface-name>{{ application.interface_name }}</interface-name>
+                    </ipv4>
+                   {% endfor %}
+                </source-address>
+