diff --git a/nodes/templates/bgp-peer.template.conf b/nodes/templates/bgp-peer.template.conf
index f8c6df4..2c8de7b 100644
--- a/nodes/templates/bgp-peer.template.conf
+++ b/nodes/templates/bgp-peer.template.conf
@@ -9,7 +9,7 @@ protocol bgp dn42_{{peering["MNT"][:-4].lower()}}_{{peering["ASN"][-4:]}} from d
     #import where dn42_import_filter(x,y,z);
     #export where dn42_export_filter(x,y,z); 
     #}
-    extended next hop {% if peering["bgp_enh"] %}on{%else%}off{%endif%};
+    extended next hop off;
   };
   ipv6 {
     {# TODO: implement pinging peer for bgp-communities
@@ -28,7 +28,7 @@ protocol bgp dn42_{{peering["MNT"][:-4].lower()}}_{{peering['ASN'][-4:]}}_4 from
 };
 
 protocol bgp dn42_{{peering["MNT"][:-4].lower()}}_{{peering['ASN'][-4:]}}_6 from dnpeers {
-  neighbor {{peering["ipv6"]}} as {{peering["ASN"]}};
+  neighbor {{peering["ipv6"] if "ipv6" in peering else peering["ipv6ll"]}} as {{peering["ASN"]}};
   passive off;
   #import where dn42_import_filter(x,y,z);
   #export where dn42_export_filter(x,y,z);
diff --git a/web/frontend/peerings-edit.html b/web/frontend/peerings-edit.html
index 9d98782..b304b08 100644
--- a/web/frontend/peerings-edit.html
+++ b/web/frontend/peerings-edit.html
@@ -155,7 +155,7 @@
         let enh_anabled = document.getElementById("bgp-extended-next-hop").checked;
         if (enh_anabled) {
             example_config_bird2_enh4.innerHTML = "on";
-            example_config_bird2_enh6.innerHTML = "on";
+            //example_config_bird2_enh6.innerHTML = "on";
         } else {
             example_config_bird2_enh4.innerHTML = "off";
             example_config_bird2_enh6.innerHTML = "off";
@@ -266,7 +266,7 @@ protocol bgp dn42_{{config["MNT"][:-4].lower()}} from dnpeers {
         extended next hop <span id="example-config-bird2-enh4">on</span>;
     };
     ipv6 {
-        extended next hop <span id="example-config-bird2-enh6">on</span>;
+        extended next hop <span id="example-config-bird2-enh6">off</span>;
     };
 }
     </pre>
diff --git a/web/frontend/peerings-new.html b/web/frontend/peerings-new.html
index 9d2e638..b72eeea 100644
--- a/web/frontend/peerings-new.html
+++ b/web/frontend/peerings-new.html
@@ -155,7 +155,7 @@
         let enh_anabled = document.getElementById("bgp-extended-next-hop").checked;
         if (enh_anabled) {
             example_config_bird2_enh4.innerHTML = "on";
-            example_config_bird2_enh6.innerHTML = "on";
+            //example_config_bird2_enh6.innerHTML = "on";
         } else {
             example_config_bird2_enh4.innerHTML = "off";
             example_config_bird2_enh6.innerHTML = "off";
@@ -263,7 +263,7 @@ protocol bgp dn42_{{config["MNT"][:-4].lower()}} from dnpeers {
         extended next hop <span id="example-config-bird2-enh4">on</span>;
     };
     ipv6 {
-        extended next hop <span id="example-config-bird2-enh6">on</span>;
+        extended next hop <span id="example-config-bird2-enh6">off</span>;
     };
 }
     </pre>