diff --git a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2 b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
index bfdb3d26423b2f98000dfcdc5276c2fb7040613f..8c373737083fea0c85384925432f9a7b529337b1 100644
--- a/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
+++ b/geant/gap_ansible/roles/iptrunk/templates/nokia/trunk_interface.j2
@@ -46,6 +46,11 @@
                       </tx-tlvs>
                   </dest-mac>
               </lldp>
+              <network>
+                  <egress>
+                      <queue-policy>GEANT_BASIC</queue-policy>
+                  </egress>
+              </network>
           </ethernet>
       </port>
 {% endfor %}
@@ -85,8 +90,8 @@
                   <multiplier>3</multiplier>
                   <receive-interval>{{ bfd_min_interval }}</receive-interval>
                   <transmit-interval>{{ bfd_min_interval }}</transmit-interval>
-                  <local-ip-address>{{ local['loopback'] }}</local-ip-address>
-                  <remote-ip-address>{{ remote['loopback'] }}</remote-ip-address>
+                  <local-ip-address>{{ (local.ipv4_address | split('/'))[0] }}</local-ip-address>
+                  <remote-ip-address>{{ (remote.ipv4_address | split('/'))[0] }}</remote-ip-address>
               </ipv4>
           </bfd-liveness>
           {% endif %}
diff --git a/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2 b/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2
index 3168ab25bba47315c9de27fe30ab110c5cc24f1f..0c1e4af6bd8010f2f61550b225cf1b7754027982 100644
--- a/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2
+++ b/geant/gap_ansible/roles/iptrunk_migration/templates/nokia/trunk_interface.j2
@@ -52,6 +52,7 @@
           <bfd-liveness>
               <ipv4>
                   <admin-state>enable</admin-state>
+                  <bfd-on-distributing-only>true</bfd-on-distributing-only>
                   <multiplier>3</multiplier>
                   <receive-interval>{{ bfd_min_interval }}</receive-interval>
                   <transmit-interval>{{ bfd_min_interval }}</transmit-interval>