diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp
index b936a8d..93d3549 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp
@@ -1,4 +1,4 @@
-comment { Gi10/0/0 is connected to the IPng Networks lab uplink }
+comment { Gi10/0/0 is connected to lab.ipng.ch:lab0 }
 set interface mtu 9000 GigabitEthernet10/0/0 
 set interface mtu packet 1500 GigabitEthernet10/0/0
 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:fffe/112
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp
index 995391b..5d38b42 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp
@@ -1,4 +1,4 @@
-comment { Gi10/0/0 is connected to vpp0-2:Gi0/0/1 }
+comment { Gi10/0/0 is connected to vpp0-2:Gi10/0/1 }
 set interface mtu 9000 GigabitEthernet10/0/0 
 set interface mtu packet 9000 GigabitEthernet10/0/0
 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::3:03/112
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp
index f55e735..8722b58 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp
@@ -1,4 +1,4 @@
-comment { Gi10/0/0 is connected to the IPng Networks lab uplink }
+comment { Gi10/0/0 is connected to lab.ipng.ch:lab1 }
 set interface mtu 9000 GigabitEthernet10/0/0 
 set interface mtu packet 1500 GigabitEthernet10/0/0
 set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::0:fffe/112
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp
index 50b5655..c749b49 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp
@@ -1,4 +1,4 @@
-comment { Gi10/0/0 is connected to vpp1-2:Gi0/0/1 }
+comment { Gi10/0/0 is connected to vpp1-2:Gi10/0/1 }
 set interface mtu 9000 GigabitEthernet10/0/0 
 set interface mtu packet 9000 GigabitEthernet10/0/0
 set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::3:13/112
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp
index 2835760..28ecb80 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp
@@ -1,4 +1,4 @@
-comment { Gi10/0/0 is connected to the IPng Networks lab uplink }
+comment { Gi10/0/0 is connected to lab.ipng.ch:lab2 }
 set interface mtu 9000 GigabitEthernet10/0/0 
 set interface mtu packet 1500 GigabitEthernet10/0/0
 set interface ip address GigabitEthernet10/0/0 2001:678:d78:221::0:fffe/112
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp
index d1e57ff..2c747b6 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp
@@ -1,4 +1,4 @@
-comment { Gi10/0/0 is connected to vpp2-2:Gi0/0/1 }
+comment { Gi10/0/0 is connected to vpp2-2:Gi10/0/1 }
 set interface mtu 9000 GigabitEthernet10/0/0 
 set interface mtu packet 9000 GigabitEthernet10/0/0
 set interface ip address GigabitEthernet10/0/0 2001:678:d78:221::3:23/112
diff --git a/overlays/bird/common/etc/vpp/config/interface.vpp.j2 b/overlays/bird/common/etc/vpp/config/interface.vpp.j2
index 205454c..13fc468 100644
--- a/overlays/bird/common/etc/vpp/config/interface.vpp.j2
+++ b/overlays/bird/common/etc/vpp/config/interface.vpp.j2
@@ -1,2 +1,41 @@
-comment { This file is overridden by blobs/{{node.hostname}}/etc/vpp/config/interfaces.vpp }
+{% if node.id == 0 %}
+comment { Gi10/0/0 is connected to lab.ipng.ch:lab{{lab.id}} }
+set interface mtu 9000 GigabitEthernet10/0/0 
+set interface mtu packet 1500 GigabitEthernet10/0/0
+set interface ip address GigabitEthernet10/0/0 2001:678:d78:2{{lab.id}}1::{{node.id}}:fffe/112
+set interface ip address GigabitEthernet10/0/0 192.168.{{10+lab.id}}.{{5+2*node.id}}/31
+set interface state GigabitEthernet10/0/0 up
+{% else %}
+comment { Gi10/0/0 is connected to vpp{{lab.id}}-{{node.id-1}}:Gi10/0/1 }
+set interface mtu 9000 GigabitEthernet10/0/0 
+set interface mtu packet 9000 GigabitEthernet10/0/0
+set interface ip address GigabitEthernet10/0/0 2001:678:d78:2{{lab.id}}1::{{node.id}}:{{lab.id}}{{node.id}}/112
+set interface ip address GigabitEthernet10/0/0 192.168.{{10+lab.id}}.{{5+2*node.id}}/31
+set interface state GigabitEthernet10/0/0 up
+{% endif %}
+
+{% if node.id < 3 %}
+comment { Gi10/0/1 is connected to vpp{{lab.id}}-{{node.id+1}}:Gi10/0/0 }
+set interface mtu 9000 GigabitEthernet10/0/1
+set interface mtu packet 9000 GigabitEthernet10/0/1
+set interface ip address GigabitEthernet10/0/1 2001:678:d78:2{{lab.id}}1::{{node.id+1}}:{{lab.id}}{{node.id}}/112
+set interface ip address GigabitEthernet10/0/1 192.168.{{10+lab.id}}.{{6+2*node.id}}/31
+set interface state GigabitEthernet10/0/1 up
+{% else %}
+comment { Gi10/0/1 is free to use }
+set interface mtu 9000 GigabitEthernet10/0/1
+set interface mtu packet 9000 GigabitEthernet10/0/1
+set interface state GigabitEthernet10/0/1 down
+{% endif %}
+
+comment { Gi10/0/2 is free to use }
+set interface mtu 9000 GigabitEthernet10/0/2
+set interface mtu packet 9000 GigabitEthernet10/0/2
+set interface state GigabitEthernet10/0/2 down
+
+comment { Gi10/0/3 is free to use }
+set interface mtu 9000 GigabitEthernet10/0/3
+set interface mtu packet 9000 GigabitEthernet10/0/3
+set interface state GigabitEthernet10/0/3 down
+
 
diff --git a/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp
deleted file mode 100644
index ba1de85..0000000
--- a/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to the IPng Networks lab uplink }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 1500 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:fffe/112
-set interface ip address GigabitEthernet10/0/0 192.168.10.5/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112
-set interface ip address GigabitEthernet10/0/1 192.168.10.6/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp
deleted file mode 100644
index d5865c8..0000000
--- a/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112
-set interface ip address GigabitEthernet10/0/0 192.168.10.7/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112
-set interface ip address GigabitEthernet10/0/1 192.168.10.8/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp
deleted file mode 100644
index 5968799..0000000
--- a/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112
-set interface ip address GigabitEthernet10/0/0 192.168.10.9/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112
-set interface ip address GigabitEthernet10/0/1 192.168.10.10/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp
deleted file mode 100644
index c0d2595..0000000
--- a/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,23 +0,0 @@
-comment { Gi10/0/0 is connected to vpp0-2:Gi0/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::3:03/112
-set interface ip address GigabitEthernet10/0/0 192.168.10.11/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface state GigabitEthernet10/0/1 down
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp1-0/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp1-0/etc/vpp/config/interface.vpp
deleted file mode 100644
index 83049db..0000000
--- a/overlays/bird/hostname/vpp1-0/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to the IPng Networks lab uplink }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 1500 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::0:fffe/112
-set interface ip address GigabitEthernet10/0/0 192.168.11.5/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp1-1:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::1:10/112
-set interface ip address GigabitEthernet10/0/1 192.168.11.6/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp1-1/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp1-1/etc/vpp/config/interface.vpp
deleted file mode 100644
index 502ab52..0000000
--- a/overlays/bird/hostname/vpp1-1/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to vpp1-0:Gi10/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::1:11/112
-set interface ip address GigabitEthernet10/0/0 192.168.11.7/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp1-2:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::2:11/112
-set interface ip address GigabitEthernet10/0/1 192.168.11.8/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp1-2/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp1-2/etc/vpp/config/interface.vpp
deleted file mode 100644
index 7992e98..0000000
--- a/overlays/bird/hostname/vpp1-2/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to vpp1-1:Gi10/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::2:12/112
-set interface ip address GigabitEthernet10/0/0 192.168.11.9/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp1-3:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::3:12/112
-set interface ip address GigabitEthernet10/0/1 192.168.11.10/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp1-3/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp1-3/etc/vpp/config/interface.vpp
deleted file mode 100644
index 08d5964..0000000
--- a/overlays/bird/hostname/vpp1-3/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,23 +0,0 @@
-comment { Gi10/0/0 is connected to vpp1-2:Gi0/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::3:13/112
-set interface ip address GigabitEthernet10/0/0 192.168.11.11/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface state GigabitEthernet10/0/1 down
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp2-0/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp2-0/etc/vpp/config/interface.vpp
deleted file mode 100644
index c214233..0000000
--- a/overlays/bird/hostname/vpp2-0/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to the IPng Networks lab uplink }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 1500 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:221::0:fffe/112
-set interface ip address GigabitEthernet10/0/0 192.168.12.5/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp2-1:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:221::1:20/112
-set interface ip address GigabitEthernet10/0/1 192.168.12.6/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp2-1/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp2-1/etc/vpp/config/interface.vpp
deleted file mode 100644
index 514d24c..0000000
--- a/overlays/bird/hostname/vpp2-1/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to vpp2-0:Gi10/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:221::1:21/112
-set interface ip address GigabitEthernet10/0/0 192.168.12.7/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp2-2:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:221::2:21/112
-set interface ip address GigabitEthernet10/0/1 192.168.12.8/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp2-2/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp2-2/etc/vpp/config/interface.vpp
deleted file mode 100644
index 24cb2c0..0000000
--- a/overlays/bird/hostname/vpp2-2/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,25 +0,0 @@
-comment { Gi10/0/0 is connected to vpp2-1:Gi10/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:221::2:22/112
-set interface ip address GigabitEthernet10/0/0 192.168.12.9/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp2-3:Gi10/0/0 }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface ip address GigabitEthernet10/0/1 2001:678:d78:221::3:22/112
-set interface ip address GigabitEthernet10/0/1 192.168.12.10/31
-set interface state GigabitEthernet10/0/1 up
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-
diff --git a/overlays/bird/hostname/vpp2-3/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp2-3/etc/vpp/config/interface.vpp
deleted file mode 100644
index f400b27..0000000
--- a/overlays/bird/hostname/vpp2-3/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,23 +0,0 @@
-comment { Gi10/0/0 is connected to vpp2-2:Gi0/0/1 }
-set interface mtu 9000 GigabitEthernet10/0/0 
-set interface mtu packet 9000 GigabitEthernet10/0/0
-set interface ip address GigabitEthernet10/0/0 2001:678:d78:221::3:23/112
-set interface ip address GigabitEthernet10/0/0 192.168.12.11/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/1
-set interface mtu packet 9000 GigabitEthernet10/0/1
-set interface state GigabitEthernet10/0/1 down
-
-comment { Gi10/0/2 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/2
-set interface mtu packet 9000 GigabitEthernet10/0/2
-set interface state GigabitEthernet10/0/2 down
-
-comment { Gi10/0/3 is free to use }
-set interface mtu 9000 GigabitEthernet10/0/3
-set interface mtu packet 9000 GigabitEthernet10/0/3
-set interface state GigabitEthernet10/0/3 down
-
-