diff --git a/juniper-macros.j2 b/juniper-macros.j2
index abe49aa..a649ad2 100644
--- a/juniper-macros.j2
+++ b/juniper-macros.j2
@@ -290,12 +290,12 @@ routing-options {
 {% set name=device['name'] %}
 {% endif %}
     bgp {
-        log-updown;
 {{ bgpoverlaygroup(device) }}
 {% if role == 'Spine' %}
 {{ bgprrmeshgroup(device,spines) }}
 {% endif %}
 {{ bgpunderlaygroup(device) }}
+        log-updown;
     }
 {%- endmacro %}