diff --git a/build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms b/build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms
+++ b/build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms b/build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms
+++ b/build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms b/build/bird/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms
+++ b/build/bird/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms b/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms b/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms b/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms b/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
+++ b/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
+++ b/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
+++ b/build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms b/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
+++ b/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms b/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
+++ b/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms b/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
+++ b/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms b/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms b/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms b/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms b/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
+++ b/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms b/build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms
+++ b/build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms b/build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms
+++ b/build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms b/build/frr/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms
+++ b/build/frr/hvn0.lab.ipng.ch/tap0-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/frr/frr.conf b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/frr/frr.conf
index 848a879..27cd0b5 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/frr/frr.conf
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/frr/frr.conf
@@ -44,9 +44,6 @@ mpls ldp
   discovery transport-address 192.168.10.0
   label local advertise explicit-null
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
@@ -57,9 +54,6 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms b/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms b/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms b/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/frr/frr.conf b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/frr/frr.conf
index b676d84..57e4d36 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/frr/frr.conf
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/frr/frr.conf
@@ -47,9 +47,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
  address-family ipv6
@@ -60,9 +57,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
 exit
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms b/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms b/build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
+++ b/build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms b/build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
+++ b/build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms b/build/frr/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
+++ b/build/frr/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/frr/frr.conf b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/frr/frr.conf
index 482a100..1bc0c0d 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/frr/frr.conf
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/frr/frr.conf
@@ -44,9 +44,6 @@ mpls ldp
   discovery transport-address 192.168.11.0
   label local advertise explicit-null
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
@@ -57,9 +54,6 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms b/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms b/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms b/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/frr/frr.conf b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/frr/frr.conf
index 5cf3225..314e0da 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/frr/frr.conf
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/frr/frr.conf
@@ -47,9 +47,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
  address-family ipv6
@@ -60,9 +57,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
 exit
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms b/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms b/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
+++ b/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms b/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
+++ b/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms b/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
+++ b/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf
index 179015e..0717608 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf
@@ -44,9 +44,6 @@ mpls ldp
   discovery transport-address 192.168.12.0
   label local advertise explicit-null
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
@@ -57,9 +54,6 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
-  interface e0
-  exit
-  !
   interface e1
   exit
   !
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms b/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms b/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms b/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf
index 912a39e..aeb8280 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf
@@ -47,9 +47,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
  address-family ipv6
@@ -60,9 +57,6 @@ mpls ldp
   interface e0
   exit
   !
-  interface e1
-  exit
-  !
  exit-address-family
  !
 exit
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms b/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
index 93e0c65..c44e66f 100644
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
+++ b/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
\ No newline at end of file
diff --git a/overlays/_common/common/root/lab-build/perms b/overlays/_common/common/root/lab-build/perms
index 4fb9400..45a093d 100644
--- a/overlays/_common/common/root/lab-build/perms
+++ b/overlays/_common/common/root/lab-build/perms
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo " * Fixing permissions"
-chown -R root. /root/
-chown -R ipng. /home/ipng/
+chown -R root:root /root/
+chown -R ipng:ipng /home/ipng/
 
 [ -r /etc/rc.local ] && chmod 755 /etc/rc.local
diff --git a/overlays/frr/vpp/etc/frr/frr.conf.j2 b/overlays/frr/vpp/etc/frr/frr.conf.j2
index 5a48fe4..3df69a4 100644
--- a/overlays/frr/vpp/etc/frr/frr.conf.j2
+++ b/overlays/frr/vpp/etc/frr/frr.conf.j2
@@ -46,12 +46,16 @@ mpls ldp
   discovery transport-address {{ loop4 }}
   label local advertise explicit-null
   !
+{% if node.id > 0 %}
   interface e0
   exit
   !
+{% endif %}
+{% if node.id < 3 %}
   interface e1
   exit
   !
+{% endif %}
  exit-address-family
  !
  address-family ipv6
@@ -59,12 +63,16 @@ mpls ldp
   label local advertise explicit-null
   ttl-security disable
   !
+{% if node.id > 0 %}
   interface e0
   exit
   !
+{% endif %}
+{% if node.id < 3 %}
   interface e1
   exit
   !
+{% endif %}
  exit-address-family
  !
 exit