diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/etc/hostname b/build/bird/hvn1.lab.ipng.ch/host1-0/etc/hostname
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/etc/hostname
rename to build/bird/hvn1.lab.ipng.ch/host1-0/etc/hostname
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/etc/hosts b/build/bird/hvn1.lab.ipng.ch/host1-0/etc/hosts
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/etc/hosts
rename to build/bird/hvn1.lab.ipng.ch/host1-0/etc/hosts
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/etc/motd b/build/bird/hvn1.lab.ipng.ch/host1-0/etc/motd
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/etc/motd
rename to build/bird/hvn1.lab.ipng.ch/host1-0/etc/motd
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn1.lab.ipng.ch/host1-0/etc/netns/dataplane/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/etc/netns/dataplane/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/host1-0/etc/netns/dataplane/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn1.lab.ipng.ch/host1-0/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/etc/netplan/01-netcfg.yaml
rename to build/bird/hvn1.lab.ipng.ch/host1-0/etc/netplan/01-netcfg.yaml
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/etc/resolv.conf b/build/bird/hvn1.lab.ipng.ch/host1-0/etc/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/etc/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/host1-0/etc/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/root/lab-build/disable-vpp b/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/disable-vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/root/lab-build/disable-vpp
rename to build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/disable-vpp
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
rename to build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/perms
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/etc/hostname b/build/bird/hvn1.lab.ipng.ch/host1-1/etc/hostname
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/etc/hostname
rename to build/bird/hvn1.lab.ipng.ch/host1-1/etc/hostname
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/etc/hosts b/build/bird/hvn1.lab.ipng.ch/host1-1/etc/hosts
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/etc/hosts
rename to build/bird/hvn1.lab.ipng.ch/host1-1/etc/hosts
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/etc/motd b/build/bird/hvn1.lab.ipng.ch/host1-1/etc/motd
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/etc/motd
rename to build/bird/hvn1.lab.ipng.ch/host1-1/etc/motd
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/etc/netns/dataplane/resolv.conf b/build/bird/hvn1.lab.ipng.ch/host1-1/etc/netns/dataplane/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/etc/netns/dataplane/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/host1-1/etc/netns/dataplane/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/etc/netplan/01-netcfg.yaml b/build/bird/hvn1.lab.ipng.ch/host1-1/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/etc/netplan/01-netcfg.yaml
rename to build/bird/hvn1.lab.ipng.ch/host1-1/etc/netplan/01-netcfg.yaml
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/etc/resolv.conf b/build/bird/hvn1.lab.ipng.ch/host1-1/etc/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/etc/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/host1-1/etc/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/root/lab-build/disable-vpp b/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/disable-vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/root/lab-build/disable-vpp
rename to build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/disable-vpp
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
rename to build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/perms
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/etc/hostname b/build/bird/hvn1.lab.ipng.ch/tap1-0/etc/hostname
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/etc/hostname
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/etc/hostname
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/etc/hosts b/build/bird/hvn1.lab.ipng.ch/tap1-0/etc/hosts
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/etc/hosts
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/etc/hosts
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/etc/motd b/build/bird/hvn1.lab.ipng.ch/tap1-0/etc/motd
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/etc/motd
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/etc/motd
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn1.lab.ipng.ch/tap1-0/etc/netns/dataplane/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/etc/netns/dataplane/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/etc/netns/dataplane/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn1.lab.ipng.ch/tap1-0/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/etc/netplan/01-netcfg.yaml
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/etc/netplan/01-netcfg.yaml
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/etc/rc.local b/build/bird/hvn1.lab.ipng.ch/tap1-0/etc/rc.local
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/etc/rc.local
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/etc/rc.local
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/etc/resolv.conf b/build/bird/hvn1.lab.ipng.ch/tap1-0/etc/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/etc/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/etc/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/root/lab-build/disable-vpp b/build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/disable-vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/root/lab-build/disable-vpp
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/disable-vpp
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
rename to build/bird/hvn1.lab.ipng.ch/tap1-0/root/lab-build/perms
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/bfd.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/bfd.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/bfd.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/bfd.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/hostname b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/hostname
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/hostname
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/hostname
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/hosts b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/hosts
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/hosts
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/hosts
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/motd b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/motd
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/motd
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/motd
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp
similarity index 91%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp
index 91510ae..ce0fc99 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp
@@ -3,6 +3,7 @@ exec /etc/vpp/config/defaults.vpp
 exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
+exec /etc/vpp/config/mpls.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp
new file mode 100644
index 0000000..0f2a444
--- /dev/null
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp
@@ -0,0 +1,2 @@
+mpls table add 0
+set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/perms
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/bfd.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/bfd.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/bfd.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/bfd.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/hostname b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/hostname
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/hostname
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/hostname
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/hosts b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/hosts
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/hosts
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/hosts
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/motd b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/motd
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/motd
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/motd
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp
similarity index 91%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp
index 91510ae..ce0fc99 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp
@@ -3,6 +3,7 @@ exec /etc/vpp/config/defaults.vpp
 exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
+exec /etc/vpp/config/mpls.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp
new file mode 100644
index 0000000..2ba18c5
--- /dev/null
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp
@@ -0,0 +1,3 @@
+mpls table add 0
+set interface mpls GigabitEthernet10/0/0 enable
+set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/perms
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/bfd.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/bfd.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/bfd.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/bfd.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/hostname b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/hostname
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/hostname
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/hostname
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/hosts b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/hosts
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/hosts
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/hosts
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/motd b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/motd
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/motd
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/motd
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp
similarity index 91%
rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp
index 91510ae..ce0fc99 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp
@@ -3,6 +3,7 @@ exec /etc/vpp/config/defaults.vpp
 exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
+exec /etc/vpp/config/mpls.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp
new file mode 100644
index 0000000..2ba18c5
--- /dev/null
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp
@@ -0,0 +1,3 @@
+mpls table add 0
+set interface mpls GigabitEthernet10/0/0 enable
+set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/perms
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/bfd.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/bfd.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/bfd.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/bfd.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/hostname b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/hostname
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/hostname
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/hostname
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/hosts b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/hosts
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/hosts
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/hosts
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/motd b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/motd
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/motd
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/motd
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp
similarity index 91%
rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp
index 91510ae..ce0fc99 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp
@@ -3,6 +3,7 @@ exec /etc/vpp/config/defaults.vpp
 exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
+exec /etc/vpp/config/mpls.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp
new file mode 100644
index 0000000..ed52371
--- /dev/null
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp
@@ -0,0 +1,2 @@
+mpls table add 0
+set interface mpls GigabitEthernet10/0/0 enable
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
similarity index 100%
rename from build/default/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/perms
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/root/lab-build/test b/build/default/hvn1.lab.ipng.ch/host1-0/root/lab-build/test
deleted file mode 100644
index 3b172e3..0000000
--- a/build/default/hvn1.lab.ipng.ch/host1-0/root/lab-build/test
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "Testing build snippets"
-date
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/root/lab-build/test b/build/default/hvn1.lab.ipng.ch/host1-1/root/lab-build/test
deleted file mode 100644
index 3b172e3..0000000
--- a/build/default/hvn1.lab.ipng.ch/host1-1/root/lab-build/test
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "Testing build snippets"
-date
diff --git a/command b/command
index 608e593..2933789 100755
--- a/command
+++ b/command
@@ -1,5 +1,5 @@
 #!/bin/sh
-BUILD=${BUILD:=default}
+BUILD=${BUILD:=bird}
 LAB=${LAB:=0}
 
 ## Do not touch below this line
diff --git a/config/common/generic.yaml b/config/common/generic.yaml
index f9b2b4e..377b5f9 100644
--- a/config/common/generic.yaml
+++ b/config/common/generic.yaml
@@ -1,8 +1,4 @@
 overlays:
-  default:
-    path: overlays/bird/
-    build: build/default/
-
   bird:
     path: overlays/bird/
     build: build/bird/
diff --git a/create b/create
index 4a3006d..a24f92d 100755
--- a/create
+++ b/create
@@ -15,8 +15,8 @@
 ##     *  Unmount the staging directories
 ##     *  Start the VMs
 
-BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20230403-release}
-BUILD=${BUILD:=default}
+BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-bullseye-disk0@20230531-release}
+BUILD=${BUILD:=bird}
 LAB=${LAB:=0}
 
 [ -r .lock${LAB} ] && {
diff --git a/generate b/generate
index 091e449..67efbe4 100755
--- a/generate
+++ b/generate
@@ -202,9 +202,9 @@ def main():
     parser.add_argument(
         "--overlay",
         dest="overlay",
-        default="default",
+        default="bird",
         type=str,
-        help="""Type of lab setup (defined in config/common/generic.yaml 'overlays' dictionary, defaults to 'default')""",
+        help="""Type of lab setup (defined in config/common/generic.yaml 'overlays' dictionary, defaults to 'bird')""",
     )
     parser.add_argument(
         "-o",
diff --git a/overlays/bird/vpp/etc/vpp/bootstrap.vpp.j2 b/overlays/bird/vpp/etc/vpp/bootstrap.vpp.j2
index 8824063..ad00cd7 100644
--- a/overlays/bird/vpp/etc/vpp/bootstrap.vpp.j2
+++ b/overlays/bird/vpp/etc/vpp/bootstrap.vpp.j2
@@ -3,6 +3,7 @@ exec /etc/vpp/config/defaults.vpp
 exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
+exec /etc/vpp/config/mpls.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 
diff --git a/overlays/bird/vpp/etc/vpp/config/mpls.vpp.j2 b/overlays/bird/vpp/etc/vpp/config/mpls.vpp.j2
new file mode 100644
index 0000000..656cb41
--- /dev/null
+++ b/overlays/bird/vpp/etc/vpp/config/mpls.vpp.j2
@@ -0,0 +1,8 @@
+mpls table add 0
+{% if node.id > 0 %}
+set interface mpls GigabitEthernet10/0/0 enable
+{% endif %}
+{% if node.id < 3 %}
+set interface mpls GigabitEthernet10/0/1 enable
+{% endif %}
+
diff --git a/overlays/default/ovs-config.sh b/overlays/default/ovs-config.sh
deleted file mode 120000
index 810b9d7..0000000
--- a/overlays/default/ovs-config.sh
+++ /dev/null
@@ -1 +0,0 @@
-../bird/ovs-config.sh
\ No newline at end of file