diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/hostname b/build/bird/hvn2.lab.ipng.ch/host2-0/etc/hostname
deleted file mode 100644
index 1cfe56c..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host2-0
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/hosts b/build/bird/hvn2.lab.ipng.ch/host2-0/etc/hosts
deleted file mode 100644
index db8295e..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host2-0.lab.ipng.ch  host2-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/motd b/build/bird/hvn2.lab.ipng.ch/host2-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn2.lab.ipng.ch/host2-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn2.lab.ipng.ch/host2-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 67a18aa..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.34/24, 2001:678:d78:50b::22/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf b/build/bird/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/disable-vpp b/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
deleted file mode 100644
index 248991f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host2-0</name>
-  <uuid>ea424fc6-763c-6113-39f1-4f1b97ba3de3</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:00:00'/>
-      <source bridge='mgmt'/>
-      <target dev='host2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/hostname b/build/bird/hvn2.lab.ipng.ch/host2-1/etc/hostname
deleted file mode 100644
index f84f4be..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host2-1
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/hosts b/build/bird/hvn2.lab.ipng.ch/host2-1/etc/hosts
deleted file mode 100644
index 7493c64..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host2-1.lab.ipng.ch  host2-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/motd b/build/bird/hvn2.lab.ipng.ch/host2-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/netns/dataplane/resolv.conf b/build/bird/hvn2.lab.ipng.ch/host2-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/netplan/01-netcfg.yaml b/build/bird/hvn2.lab.ipng.ch/host2-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index fc60e00..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.35/24, 2001:678:d78:50b::23/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf b/build/bird/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/disable-vpp b/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
deleted file mode 100644
index 991ad74..0000000
--- a/build/bird/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host2-1</name>
-  <uuid>8a760f61-f67e-92b1-f385-a9c819dc1a4c</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host2-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:00:10'/>
-      <source bridge='mgmt'/>
-      <target dev='host2-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/hostname b/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/hostname
deleted file mode 100644
index 772a352..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-tap2-0
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/hosts b/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/hosts
deleted file mode 100644
index b534475..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       tap2-0.lab.ipng.ch  tap2-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/motd b/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 081d480..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.36/24, 2001:678:d78:50b::24/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/rc.local b/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/rc.local
deleted file mode 100644
index 08e364f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/rc.local
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-ip link set enp16s0f0 alias mirror-rx mtu 9216 up
-ip link set enp16s0f1 alias mirror-tx mtu 9216 up
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf b/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/disable-vpp b/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
deleted file mode 100644
index fb53cb1..0000000
--- a/build/bird/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>tap2-0</name>
-  <uuid>9a254420-def6-9e7b-565a-1ae3b2d0e8ef</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/tap2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:02:00'/>
-      <source bridge='mgmt'/>
-      <target dev='tap2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf
deleted file mode 100644
index 198e003..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp2-0
-router id 192.168.12.0;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/bfd.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf
deleted file mode 100644
index 25d349d..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf
deleted file mode 100644
index 9f6c523..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.12.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:220::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf
deleted file mode 100644
index 6c480b1..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp2-0
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/hostname b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/hostname
deleted file mode 100644
index 0bc429a..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-0
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/hosts b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/hosts
deleted file mode 100644
index 6b40686..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-0.lab.ipng.ch  vpp2-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/motd b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 853e5b3..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.30/24, 2001:678:d78:50b::1e/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/flowprobe.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index a0efa87..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.0 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp
deleted file mode 100644
index dd7cc2c..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to lab.ipng.ch:lab2 }
-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::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/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 5b974ce..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.0/32
-set interface ip address loop0 2001:678:d78:220::/128
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp
deleted file mode 100644
index 1e73a8f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-0 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/mpls.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 0f2a444..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/sflow.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/disable-frr b/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
deleted file mode 100644
index 438aa0d..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-0</name>
-  <uuid>d1414a92-a6bc-c013-0f8a-b668c50f5ec3</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:00'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf
deleted file mode 100644
index 3c2429a..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp2-1
-router id 192.168.12.1;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/bfd.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf
deleted file mode 100644
index 25d349d..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf
deleted file mode 100644
index 9f6c523..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.12.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:220::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf
deleted file mode 100644
index 71c6837..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp2-1
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/hostname b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/hostname
deleted file mode 100644
index 2191de4..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-1
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/hosts b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/hosts
deleted file mode 100644
index af6e872..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-1.lab.ipng.ch  vpp2-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/motd b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 0d9a02a..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.31/24, 2001:678:d78:50b::1f/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/flowprobe.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 5816f6c..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.1 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp
deleted file mode 100644
index de0b6ee..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +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/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 0b1ed03..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.1/32
-set interface ip address loop0 2001:678:d78:220::1/128
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp
deleted file mode 100644
index e032bea..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-1 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/mpls.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/sflow.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/disable-frr b/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
deleted file mode 100644
index 8804acc..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-1</name>
-  <uuid>c255cbc3-2055-76b6-38e6-38c020711b3f</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:10'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf
deleted file mode 100644
index 8c351a4..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp2-2
-router id 192.168.12.2;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/bfd.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf
deleted file mode 100644
index 25d349d..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf
deleted file mode 100644
index 9f6c523..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.12.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:220::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf
deleted file mode 100644
index a66d4fa..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp2-2
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/hostname b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/hostname
deleted file mode 100644
index 7c813a8..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-2
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/hosts b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/hosts
deleted file mode 100644
index d0477cf..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-2.lab.ipng.ch  vpp2-2
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/motd b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 87f1aea..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.32/24, 2001:678:d78:50b::20/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/flowprobe.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 463b0b7..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.2 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp
deleted file mode 100644
index 027b8b7..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +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/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 90a007f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.2/32
-set interface ip address loop0 2001:678:d78:220::2/128
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp
deleted file mode 100644
index ad5c6e9..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-2 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/mpls.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/sflow.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/disable-frr b/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
deleted file mode 100644
index b04f6bf..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-2</name>
-  <uuid>2c8a4f0e-8d5a-3f2e-0bb7-2373386fd066</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-2'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:20'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-2-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:20'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:21'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:22'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:23'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf
deleted file mode 100644
index b4e509a..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp2-3
-router id 192.168.12.3;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/bfd.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf
deleted file mode 100644
index 25d349d..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf
deleted file mode 100644
index 9f6c523..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.12.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:220::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf
deleted file mode 100644
index cc694dc..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp2-3
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/hostname b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/hostname
deleted file mode 100644
index 773dc59..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-3
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/hosts b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/hosts
deleted file mode 100644
index c4cf2c4..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-3.lab.ipng.ch  vpp2-3
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/motd b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 2383d6a..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.33/24, 2001:678:d78:50b::21/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/flowprobe.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 024197c..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.3 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp
deleted file mode 100644
index 2c747b6..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-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
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 5df6b09..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.3/32
-set interface ip address loop0 2001:678:d78:220::3/128
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp
deleted file mode 100644
index 84c9672..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-3 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/mpls.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/mpls.vpp
deleted file mode 100644
index ed52371..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/sflow.vpp b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys b/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/disable-frr b/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
deleted file mode 100644
index 65850bd..0000000
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-3</name>
-  <uuid>369c5302-e6f1-5120-f48d-6931012dda01</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-3'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:30'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-3-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:30'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:31'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:32'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:33'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/hostname b/build/bird/hvn3.lab.ipng.ch/host3-0/etc/hostname
deleted file mode 100644
index 8bbe1ea..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host3-0
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/hosts b/build/bird/hvn3.lab.ipng.ch/host3-0/etc/hosts
deleted file mode 100644
index 5f026c2..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host3-0.lab.ipng.ch  host3-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/motd b/build/bird/hvn3.lab.ipng.ch/host3-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn3.lab.ipng.ch/host3-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn3.lab.ipng.ch/host3-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 3bdb808..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.41/24, 2001:678:d78:50b::29/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/resolv.conf b/build/bird/hvn3.lab.ipng.ch/host3-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/host3-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/root/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/host3-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/root/lab-build/disable-vpp b/build/bird/hvn3.lab.ipng.ch/host3-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-0/root/lab-build/perms b/build/bird/hvn3.lab.ipng.ch/host3-0/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
deleted file mode 100644
index 2045c1e..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host3-0</name>
-  <uuid>11b2b960-0e94-93fe-d6ad-af614fd90c18</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host3-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:00:00'/>
-      <source bridge='mgmt'/>
-      <target dev='host3-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/hostname b/build/bird/hvn3.lab.ipng.ch/host3-1/etc/hostname
deleted file mode 100644
index 4db59e6..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host3-1
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/hosts b/build/bird/hvn3.lab.ipng.ch/host3-1/etc/hosts
deleted file mode 100644
index 3c89d9d..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host3-1.lab.ipng.ch  host3-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/motd b/build/bird/hvn3.lab.ipng.ch/host3-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/netns/dataplane/resolv.conf b/build/bird/hvn3.lab.ipng.ch/host3-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/netplan/01-netcfg.yaml b/build/bird/hvn3.lab.ipng.ch/host3-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 0923e13..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.42/24, 2001:678:d78:50b::2a/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/resolv.conf b/build/bird/hvn3.lab.ipng.ch/host3-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/home/ipng/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/host3-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/root/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/host3-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/root/lab-build/disable-vpp b/build/bird/hvn3.lab.ipng.ch/host3-1/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/host3-1/root/lab-build/perms b/build/bird/hvn3.lab.ipng.ch/host3-1/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
deleted file mode 100644
index 034f3cd..0000000
--- a/build/bird/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host3-1</name>
-  <uuid>7ac59a4c-9cd2-391f-1a64-0fe9759efd39</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host3-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:00:10'/>
-      <source bridge='mgmt'/>
-      <target dev='host3-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/hostname b/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/hostname
deleted file mode 100644
index 17180f9..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-tap3-0
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/hosts b/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/hosts
deleted file mode 100644
index 6ac5657..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       tap3-0.lab.ipng.ch  tap3-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/motd b/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index cf54e57..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.43/24, 2001:678:d78:50b::2b/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/rc.local b/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/rc.local
deleted file mode 100644
index 08e364f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/rc.local
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-ip link set enp16s0f0 alias mirror-rx mtu 9216 up
-ip link set enp16s0f1 alias mirror-tx mtu 9216 up
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/resolv.conf b/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/tap3-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/tap3-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/lab-build/disable-vpp b/build/bird/hvn3.lab.ipng.ch/tap3-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/lab-build/perms b/build/bird/hvn3.lab.ipng.ch/tap3-0/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
deleted file mode 100644
index 2ddab08..0000000
--- a/build/bird/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>tap3-0</name>
-  <uuid>241cda7a-487a-1b93-d6c9-cf0315d4c6ba</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/tap3-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:02:00'/>
-      <source bridge='mgmt'/>
-      <target dev='tap3-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf
deleted file mode 100644
index 56662fa..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp3-0
-router id 192.168.13.0;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/bfd.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf
deleted file mode 100644
index 2acb48a..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/static.conf
deleted file mode 100644
index 89928d5..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.13.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:230::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/manual.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/manual.conf
deleted file mode 100644
index d5b1fdc..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp3-0
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/hostname b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/hostname
deleted file mode 100644
index 0cfe4bb..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-0
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/hosts b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/hosts
deleted file mode 100644
index baf45c2..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-0.lab.ipng.ch  vpp3-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/motd b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/netns/dataplane/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/netplan/01-netcfg.yaml b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index d04f884..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.37/24, 2001:678:d78:50b::25/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/bootstrap.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/defaults.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/flowprobe.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 8637529..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.0 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/interface.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/interface.vpp
deleted file mode 100644
index 7a2e48e..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to lab.ipng.ch:lab3 }
-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:231::0:fffe/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.5/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp3-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:231::1:30/112
-set interface ip address GigabitEthernet10/0/1 192.168.13.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/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/lcp.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/loopback.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 3a2ae5e..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.0/32
-set interface ip address loop0 2001:678:d78:230::/128
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/manual.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/manual.vpp
deleted file mode 100644
index 8ebfad9..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-0 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/mpls.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 0f2a444..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/sflow.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/home/ipng/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/disable-frr b/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/perms b/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
deleted file mode 100644
index 64a7bf2..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-0</name>
-  <uuid>a36fc4b6-482b-f6e6-4e97-a81aea18d350</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:00'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf
deleted file mode 100644
index 7f682b9..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp3-1
-router id 192.168.13.1;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/bfd.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf
deleted file mode 100644
index 2acb48a..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/static.conf
deleted file mode 100644
index 89928d5..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.13.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:230::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/manual.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/manual.conf
deleted file mode 100644
index 65ac335..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp3-1
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/hostname b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/hostname
deleted file mode 100644
index 14db931..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-1
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/hosts b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/hosts
deleted file mode 100644
index 4fca03a..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-1.lab.ipng.ch  vpp3-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/motd b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/netns/dataplane/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/netplan/01-netcfg.yaml b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index cb54e0e..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.38/24, 2001:678:d78:50b::26/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/bootstrap.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/defaults.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/flowprobe.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 33ccbe2..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.1 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/interface.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/interface.vpp
deleted file mode 100644
index 1bbd96e..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to vpp3-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:231::1:31/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.7/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp3-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:231::2:31/112
-set interface ip address GigabitEthernet10/0/1 192.168.13.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/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/lcp.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/loopback.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 041b3e9..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.1/32
-set interface ip address loop0 2001:678:d78:230::1/128
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/manual.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/manual.vpp
deleted file mode 100644
index f5d8e83..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-1 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/mpls.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/sflow.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/home/ipng/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/disable-frr b/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/perms b/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
deleted file mode 100644
index b997458..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-1</name>
-  <uuid>a854479d-054d-ed9b-187a-cc828c1948cb</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:10'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf
deleted file mode 100644
index d3349fe..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp3-2
-router id 192.168.13.2;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/bfd.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf
deleted file mode 100644
index 2acb48a..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/static.conf
deleted file mode 100644
index 89928d5..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.13.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:230::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/manual.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/manual.conf
deleted file mode 100644
index de49b67..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp3-2
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/hostname b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/hostname
deleted file mode 100644
index 443623e..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-2
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/hosts b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/hosts
deleted file mode 100644
index add35de..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-2.lab.ipng.ch  vpp3-2
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/motd b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/netns/dataplane/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/netplan/01-netcfg.yaml b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 5d38b12..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.39/24, 2001:678:d78:50b::27/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/bootstrap.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/defaults.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/flowprobe.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 0ff4d98..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.2 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/interface.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/interface.vpp
deleted file mode 100644
index 91b5986..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to vpp3-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:231::2:32/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.9/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp3-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:231::3:32/112
-set interface ip address GigabitEthernet10/0/1 192.168.13.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/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/lcp.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/loopback.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 2e89d76..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.2/32
-set interface ip address loop0 2001:678:d78:230::2/128
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/manual.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/manual.vpp
deleted file mode 100644
index 6572009..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-2 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/mpls.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/sflow.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/home/ipng/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-2/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/disable-frr b/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/perms b/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
deleted file mode 100644
index cdec6b2..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-2</name>
-  <uuid>c38d74b3-4c80-e3b6-1085-661946f8d383</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-2'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:20'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-2-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:20'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:21'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:22'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:23'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf
deleted file mode 100644
index 8478195..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-## Bird2 configuration for vpp3-3
-router id 192.168.13.3;
-
-protocol device { scan time 30; }
-protocol direct { ipv4; ipv6; check link yes; }
-protocol kernel kernel4 {
-  ipv4 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-protocol kernel kernel6 {
-  ipv6 { import none; export where source != RTS_DEVICE; };
-  learn off;
-  scan time 300;
-}
-
-include "core/static.conf";
-include "core/bfd.conf";
-include "core/ospf.conf";
-# include "core/babel.conf";
-include "manual.conf";
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf
deleted file mode 100644
index 7652fde..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-protocol babel {
-  interface "e0", "e1" {
-    type wired;
-    extended next hop on;
-    rtt cost 1000;
-    rtt min 5ms;
-    rtt max 30ms;
-    authentication mac permissive;
-    password "IPng loves bird";
-  };
-  ipv6 { import all; export all; };
-  ipv4 { import all; export all; };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/bfd.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/bfd.conf
deleted file mode 100644
index b0f329b..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/bfd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-protocol bfd bfd1 {
-  interface "e*" {
-    interval 100 ms;
-    multiplier 20;
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf
deleted file mode 100644
index 2acb48a..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
-
-protocol ospf v3 ospf6 {
-  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
-  area 0 {
-    interface "loop0" { stub yes; };
-    interface "e0" { type pointopoint; cost 5; bfd off; };
-    interface "e1" { type pointopoint; cost 5; bfd off; };
-  };
-}
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/static.conf
deleted file mode 100644
index 89928d5..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/static.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-protocol static static4 {
-  ipv4 { export all; };
-  route 192.168.13.0/24 unreachable;
-#  route 192.0.2.0/24 via 10.0.0.1;
-}
-
-protocol static static6 {
-  ipv6 { export all; };
-  route 2001:678:d78:230::/60 unreachable;
-#  route 2001:db8:cafe::/48 via 2001:db8::1;
-}
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/manual.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/manual.conf
deleted file mode 100644
index 5e9d6f4..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/manual.conf
+++ /dev/null
@@ -1 +0,0 @@
-## Manual configuration for vpp3-3
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/hostname b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/hostname
deleted file mode 100644
index a8c1fa8..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-3
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/hosts b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/hosts
deleted file mode 100644
index bcf73b6..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-3.lab.ipng.ch  vpp3-3
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/motd b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/netns/dataplane/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/netplan/01-netcfg.yaml b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index bd34152..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.40/24, 2001:678:d78:50b::28/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/resolv.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/bootstrap.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/defaults.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/flowprobe.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index e855e3c..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.3 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/interface.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/interface.vpp
deleted file mode 100644
index 2cb2762..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,22 +0,0 @@
-comment { Gi10/0/0 is connected to vpp3-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:231::3:33/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.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/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/lcp.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/loopback.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/loopback.vpp
deleted file mode 100644
index ff79b64..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.3/32
-set interface ip address loop0 2001:678:d78:230::3/128
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/manual.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/manual.vpp
deleted file mode 100644
index b126274..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-3 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/mpls.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/mpls.vpp
deleted file mode 100644
index ed52371..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/sflow.vpp b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/home/ipng/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-3/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/.ssh/authorized_keys b/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/disable-frr b/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/disable-frr
deleted file mode 100644
index f407e86..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/disable-frr
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling FRR"
-for i in frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/perms b/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml b/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
deleted file mode 100644
index 4f36b45..0000000
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-3</name>
-  <uuid>d47cd1ce-7eb3-ba5c-275e-261797ae11cb</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-3'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:30'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-3-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:30'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:31'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:32'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:33'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/rc.conf b/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/rc.conf
deleted file mode 100644
index 67859c7..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/rc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-hostname="host2-0"
-ifconfig_vtnet0="inet 198.19.5.34/24"
-defaultrouter="198.19.5.1"
-ifconfig_vtnet0_ipv6="inet6 2001:678:d78:50b::22/64"
-ipv6_defaultrouter="2001:678:d78:50b::1"
-
-sshd_enable="YES"
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/rc.local b/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/rc.local
deleted file mode 100644
index 0ca0d53..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/rc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for s in /root/lab-build/*
-do
-  echo "** Executing $s"
-  /bin/sh $s
-done
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf b/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/ssh/sshd_config b/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/ssh/sshd_config
deleted file mode 100644
index 084b383..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/etc/ssh/sshd_config
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-# Note that some of FreeBSD's defaults differ from OpenBSD's, and
-# FreeBSD has a few additional options.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# Change to yes to enable built-in password authentication.
-# Note that passwords may also be accepted via KbdInteractiveAuthentication.
-#PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable PAM authentication
-#KbdInteractiveAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'no' to disable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the KbdInteractiveAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin prohibit-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and KbdInteractiveAuthentication to 'no'.
-#UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#UseBlacklist no
-#VersionAddendum FreeBSD-20231004
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
\ No newline at end of file
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms b/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
deleted file mode 100644
index f0a7f0d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Fixing permissions"
-chown root:wheel / /etc
-chown -R root:wheel /root
-chown -R ipng:ipng /home/ipng/
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml b/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
deleted file mode 100644
index e6d9f62..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>host2-0</name>
-  <uuid>ea424fc6-763c-6113-39f1-4f1b97ba3de3</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:00:00'/>
-      <source bridge='mgmt'/>
-      <target dev='host2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/rc.conf b/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/rc.conf
deleted file mode 100644
index 36ec627..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/rc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-hostname="host2-1"
-ifconfig_vtnet0="inet 198.19.5.35/24"
-defaultrouter="198.19.5.1"
-ifconfig_vtnet0_ipv6="inet6 2001:678:d78:50b::23/64"
-ipv6_defaultrouter="2001:678:d78:50b::1"
-
-sshd_enable="YES"
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/rc.local b/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/rc.local
deleted file mode 100644
index 0ca0d53..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/rc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for s in /root/lab-build/*
-do
-  echo "** Executing $s"
-  /bin/sh $s
-done
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf b/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/ssh/sshd_config b/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/ssh/sshd_config
deleted file mode 100644
index 084b383..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/etc/ssh/sshd_config
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-# Note that some of FreeBSD's defaults differ from OpenBSD's, and
-# FreeBSD has a few additional options.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# Change to yes to enable built-in password authentication.
-# Note that passwords may also be accepted via KbdInteractiveAuthentication.
-#PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable PAM authentication
-#KbdInteractiveAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'no' to disable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the KbdInteractiveAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin prohibit-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and KbdInteractiveAuthentication to 'no'.
-#UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#UseBlacklist no
-#VersionAddendum FreeBSD-20231004
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
\ No newline at end of file
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms b/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
deleted file mode 100644
index f0a7f0d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Fixing permissions"
-chown root:wheel / /etc
-chown -R root:wheel /root
-chown -R ipng:ipng /home/ipng/
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml b/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
deleted file mode 100644
index 01b75ad..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>host2-1</name>
-  <uuid>8a760f61-f67e-92b1-f385-a9c819dc1a4c</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host2-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:00:10'/>
-      <source bridge='mgmt'/>
-      <target dev='host2-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/rc.conf b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/rc.conf
deleted file mode 100644
index 2ebd190..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/rc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-hostname="tap2-0"
-ifconfig_vtnet0="inet 198.19.5.36/24"
-defaultrouter="198.19.5.1"
-ifconfig_vtnet0_ipv6="inet6 2001:678:d78:50b::24/64"
-ipv6_defaultrouter="2001:678:d78:50b::1"
-
-sshd_enable="YES"
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/rc.local b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/rc.local
deleted file mode 100644
index 0ca0d53..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/rc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for s in /root/lab-build/*
-do
-  echo "** Executing $s"
-  /bin/sh $s
-done
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/ssh/sshd_config b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/ssh/sshd_config
deleted file mode 100644
index 084b383..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/etc/ssh/sshd_config
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-# Note that some of FreeBSD's defaults differ from OpenBSD's, and
-# FreeBSD has a few additional options.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# Change to yes to enable built-in password authentication.
-# Note that passwords may also be accepted via KbdInteractiveAuthentication.
-#PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable PAM authentication
-#KbdInteractiveAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'no' to disable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the KbdInteractiveAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin prohibit-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and KbdInteractiveAuthentication to 'no'.
-#UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#UseBlacklist no
-#VersionAddendum FreeBSD-20231004
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
\ No newline at end of file
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
deleted file mode 100644
index f0a7f0d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Fixing permissions"
-chown root:wheel / /etc
-chown -R root:wheel /root
-chown -R ipng:ipng /home/ipng/
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
deleted file mode 100644
index 8f04f2b..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>tap2-0</name>
-  <uuid>9a254420-def6-9e7b-565a-1ae3b2d0e8ef</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/tap2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:02:00'/>
-      <source bridge='mgmt'/>
-      <target dev='tap2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/rc.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/rc.conf
deleted file mode 100644
index d5693ae..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/rc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-hostname="vpp2-0"
-ifconfig_vtnet0="inet 198.19.5.30/24"
-defaultrouter="198.19.5.1"
-ifconfig_vtnet0_ipv6="inet6 2001:678:d78:50b::1e/64"
-ipv6_defaultrouter="2001:678:d78:50b::1"
-
-sshd_enable="YES"
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/rc.local b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/rc.local
deleted file mode 100644
index 0ca0d53..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/rc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for s in /root/lab-build/*
-do
-  echo "** Executing $s"
-  /bin/sh $s
-done
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/ssh/sshd_config b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/ssh/sshd_config
deleted file mode 100644
index 084b383..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/etc/ssh/sshd_config
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-# Note that some of FreeBSD's defaults differ from OpenBSD's, and
-# FreeBSD has a few additional options.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# Change to yes to enable built-in password authentication.
-# Note that passwords may also be accepted via KbdInteractiveAuthentication.
-#PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable PAM authentication
-#KbdInteractiveAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'no' to disable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the KbdInteractiveAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin prohibit-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and KbdInteractiveAuthentication to 'no'.
-#UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#UseBlacklist no
-#VersionAddendum FreeBSD-20231004
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
\ No newline at end of file
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
deleted file mode 100644
index f0a7f0d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Fixing permissions"
-chown root:wheel / /etc
-chown -R root:wheel /root
-chown -R ipng:ipng /home/ipng/
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
deleted file mode 100644
index 1d8082d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-0</name>
-  <uuid>d1414a92-a6bc-c013-0f8a-b668c50f5ec3</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:00'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/rc.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/rc.conf
deleted file mode 100644
index 520fe20..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/rc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-hostname="vpp2-1"
-ifconfig_vtnet0="inet 198.19.5.31/24"
-defaultrouter="198.19.5.1"
-ifconfig_vtnet0_ipv6="inet6 2001:678:d78:50b::1f/64"
-ipv6_defaultrouter="2001:678:d78:50b::1"
-
-sshd_enable="YES"
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/rc.local b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/rc.local
deleted file mode 100644
index 0ca0d53..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/rc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for s in /root/lab-build/*
-do
-  echo "** Executing $s"
-  /bin/sh $s
-done
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/ssh/sshd_config b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/ssh/sshd_config
deleted file mode 100644
index 084b383..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/etc/ssh/sshd_config
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-# Note that some of FreeBSD's defaults differ from OpenBSD's, and
-# FreeBSD has a few additional options.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# Change to yes to enable built-in password authentication.
-# Note that passwords may also be accepted via KbdInteractiveAuthentication.
-#PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable PAM authentication
-#KbdInteractiveAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'no' to disable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the KbdInteractiveAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin prohibit-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and KbdInteractiveAuthentication to 'no'.
-#UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#UseBlacklist no
-#VersionAddendum FreeBSD-20231004
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
\ No newline at end of file
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
deleted file mode 100644
index f0a7f0d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Fixing permissions"
-chown root:wheel / /etc
-chown -R root:wheel /root
-chown -R ipng:ipng /home/ipng/
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
deleted file mode 100644
index 0c43c22..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-1</name>
-  <uuid>c255cbc3-2055-76b6-38e6-38c020711b3f</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:10'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/rc.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/rc.conf
deleted file mode 100644
index 6d3c0c4..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/rc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-hostname="vpp2-2"
-ifconfig_vtnet0="inet 198.19.5.32/24"
-defaultrouter="198.19.5.1"
-ifconfig_vtnet0_ipv6="inet6 2001:678:d78:50b::20/64"
-ipv6_defaultrouter="2001:678:d78:50b::1"
-
-sshd_enable="YES"
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/rc.local b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/rc.local
deleted file mode 100644
index 0ca0d53..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/rc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for s in /root/lab-build/*
-do
-  echo "** Executing $s"
-  /bin/sh $s
-done
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/ssh/sshd_config b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/ssh/sshd_config
deleted file mode 100644
index 084b383..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/etc/ssh/sshd_config
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-# Note that some of FreeBSD's defaults differ from OpenBSD's, and
-# FreeBSD has a few additional options.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# Change to yes to enable built-in password authentication.
-# Note that passwords may also be accepted via KbdInteractiveAuthentication.
-#PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable PAM authentication
-#KbdInteractiveAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'no' to disable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the KbdInteractiveAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin prohibit-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and KbdInteractiveAuthentication to 'no'.
-#UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#UseBlacklist no
-#VersionAddendum FreeBSD-20231004
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
\ No newline at end of file
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
deleted file mode 100644
index f0a7f0d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Fixing permissions"
-chown root:wheel / /etc
-chown -R root:wheel /root
-chown -R ipng:ipng /home/ipng/
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
deleted file mode 100644
index 3cc77c3..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-2</name>
-  <uuid>2c8a4f0e-8d5a-3f2e-0bb7-2373386fd066</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-2'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:20'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-2-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:20'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:21'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:22'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:23'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/rc.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/rc.conf
deleted file mode 100644
index c346bda..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/rc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-hostname="vpp2-3"
-ifconfig_vtnet0="inet 198.19.5.33/24"
-defaultrouter="198.19.5.1"
-ifconfig_vtnet0_ipv6="inet6 2001:678:d78:50b::21/64"
-ipv6_defaultrouter="2001:678:d78:50b::1"
-
-sshd_enable="YES"
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/rc.local b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/rc.local
deleted file mode 100644
index 0ca0d53..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/rc.local
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for s in /root/lab-build/*
-do
-  echo "** Executing $s"
-  /bin/sh $s
-done
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/ssh/sshd_config b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/ssh/sshd_config
deleted file mode 100644
index 084b383..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/etc/ssh/sshd_config
+++ /dev/null
@@ -1,121 +0,0 @@
-#	$OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
-
-# This is the sshd server system-wide configuration file.  See
-# sshd_config(5) for more information.
-
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-# The strategy used for options in the default sshd_config shipped with
-# OpenSSH is to specify options with their default value where
-# possible, but leave them commented.  Uncommented options override the
-# default value.
-
-# Note that some of FreeBSD's defaults differ from OpenBSD's, and
-# FreeBSD has a few additional options.
-
-#Port 22
-#AddressFamily any
-#ListenAddress 0.0.0.0
-#ListenAddress ::
-
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_ecdsa_key
-#HostKey /etc/ssh/ssh_host_ed25519_key
-
-# Ciphers and keying
-#RekeyLimit default none
-
-# Logging
-#SyslogFacility AUTH
-#LogLevel INFO
-
-# Authentication:
-
-#LoginGraceTime 2m
-PermitRootLogin yes
-#StrictModes yes
-#MaxAuthTries 6
-#MaxSessions 10
-
-#PubkeyAuthentication yes
-
-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
-# but this is overridden so installations will only check .ssh/authorized_keys
-AuthorizedKeysFile	.ssh/authorized_keys
-
-#AuthorizedPrincipalsFile none
-
-#AuthorizedKeysCommand none
-#AuthorizedKeysCommandUser nobody
-
-# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-#HostbasedAuthentication no
-# Change to yes if you don't trust ~/.ssh/known_hosts for
-# HostbasedAuthentication
-#IgnoreUserKnownHosts no
-# Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
-
-# Change to yes to enable built-in password authentication.
-# Note that passwords may also be accepted via KbdInteractiveAuthentication.
-#PasswordAuthentication no
-#PermitEmptyPasswords no
-
-# Change to no to disable PAM authentication
-#KbdInteractiveAuthentication yes
-
-# Kerberos options
-#KerberosAuthentication no
-#KerberosOrLocalPasswd yes
-#KerberosTicketCleanup yes
-#KerberosGetAFSToken no
-
-# GSSAPI options
-#GSSAPIAuthentication no
-#GSSAPICleanupCredentials yes
-
-# Set this to 'no' to disable PAM authentication, account processing,
-# and session processing. If this is enabled, PAM authentication will
-# be allowed through the KbdInteractiveAuthentication and
-# PasswordAuthentication.  Depending on your PAM configuration,
-# PAM authentication via KbdInteractiveAuthentication may bypass
-# the setting of "PermitRootLogin prohibit-password".
-# If you just want the PAM account and session checks to run without
-# PAM authentication, then enable this but set PasswordAuthentication
-# and KbdInteractiveAuthentication to 'no'.
-#UsePAM yes
-
-#AllowAgentForwarding yes
-#AllowTcpForwarding yes
-#GatewayPorts no
-#X11Forwarding no
-#X11DisplayOffset 10
-#X11UseLocalhost yes
-#PermitTTY yes
-#PrintMotd yes
-#PrintLastLog yes
-#TCPKeepAlive yes
-#PermitUserEnvironment no
-#Compression delayed
-#ClientAliveInterval 0
-#ClientAliveCountMax 3
-#UseDNS yes
-#PidFile /var/run/sshd.pid
-#MaxStartups 10:30:100
-#PermitTunnel no
-#ChrootDirectory none
-#UseBlacklist no
-#VersionAddendum FreeBSD-20231004
-
-# no default banner path
-#Banner none
-
-# override default of no subsystems
-Subsystem	sftp	/usr/libexec/sftp-server
-
-# Example of overriding settings on a per-user basis
-#Match User anoncvs
-#	X11Forwarding no
-#	AllowTcpForwarding no
-#	PermitTTY no
-#	ForceCommand cvs server
\ No newline at end of file
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
deleted file mode 100644
index ab80a77..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,7 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
deleted file mode 100644
index f0a7f0d..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-echo "Fixing permissions"
-chown root:wheel / /etc
-chown -R root:wheel /root
-chown -R ipng:ipng /home/ipng/
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
deleted file mode 100644
index 85b01ad..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-3</name>
-  <uuid>369c5302-e6f1-5120-f48d-6931012dda01</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-3'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:30'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-3-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:30'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:31'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:32'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:33'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/hostname b/build/frr/hvn2.lab.ipng.ch/host2-0/etc/hostname
deleted file mode 100644
index 1cfe56c..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host2-0
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/hosts b/build/frr/hvn2.lab.ipng.ch/host2-0/etc/hosts
deleted file mode 100644
index db8295e..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host2-0.lab.ipng.ch  host2-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/motd b/build/frr/hvn2.lab.ipng.ch/host2-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/netns/dataplane/resolv.conf b/build/frr/hvn2.lab.ipng.ch/host2-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/netplan/01-netcfg.yaml b/build/frr/hvn2.lab.ipng.ch/host2-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 67a18aa..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.34/24, 2001:678:d78:50b::22/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf b/build/frr/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/disable-vpp b/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
deleted file mode 100644
index 248991f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host2-0</name>
-  <uuid>ea424fc6-763c-6113-39f1-4f1b97ba3de3</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:00:00'/>
-      <source bridge='mgmt'/>
-      <target dev='host2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/hostname b/build/frr/hvn2.lab.ipng.ch/host2-1/etc/hostname
deleted file mode 100644
index f84f4be..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host2-1
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/hosts b/build/frr/hvn2.lab.ipng.ch/host2-1/etc/hosts
deleted file mode 100644
index 7493c64..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host2-1.lab.ipng.ch  host2-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/motd b/build/frr/hvn2.lab.ipng.ch/host2-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/netns/dataplane/resolv.conf b/build/frr/hvn2.lab.ipng.ch/host2-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/netplan/01-netcfg.yaml b/build/frr/hvn2.lab.ipng.ch/host2-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index fc60e00..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.35/24, 2001:678:d78:50b::23/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf b/build/frr/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/disable-vpp b/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
deleted file mode 100644
index 991ad74..0000000
--- a/build/frr/hvn2.lab.ipng.ch/host2-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host2-1</name>
-  <uuid>8a760f61-f67e-92b1-f385-a9c819dc1a4c</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host2-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:00:10'/>
-      <source bridge='mgmt'/>
-      <target dev='host2-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/hostname b/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/hostname
deleted file mode 100644
index 772a352..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-tap2-0
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/hosts b/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/hosts
deleted file mode 100644
index b534475..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       tap2-0.lab.ipng.ch  tap2-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/motd b/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/netns/dataplane/resolv.conf b/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/netplan/01-netcfg.yaml b/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 081d480..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.36/24, 2001:678:d78:50b::24/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/rc.local b/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/rc.local
deleted file mode 100644
index 08e364f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/rc.local
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-ip link set enp16s0f0 alias mirror-rx mtu 9216 up
-ip link set enp16s0f1 alias mirror-tx mtu 9216 up
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf b/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/disable-vpp b/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
deleted file mode 100644
index fb53cb1..0000000
--- a/build/frr/hvn2.lab.ipng.ch/tap2-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>tap2-0</name>
-  <uuid>9a254420-def6-9e7b-565a-1ae3b2d0e8ef</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/tap2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:02:00'/>
-      <source bridge='mgmt'/>
-      <target dev='tap2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:12:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/daemons b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ 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
deleted file mode 100644
index 0b88452..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/frr/frr.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-hostname vpp2-0
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.12.0
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.12.0
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.12.0
-  label local advertise explicit-null
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:220::
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/hostname b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/hostname
deleted file mode 100644
index 0bc429a..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-0
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/hosts b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/hosts
deleted file mode 100644
index 6b40686..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-0.lab.ipng.ch  vpp2-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/motd b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 853e5b3..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.30/24, 2001:678:d78:50b::1e/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/flowprobe.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index a0efa87..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.0 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp
deleted file mode 100644
index dd7cc2c..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to lab.ipng.ch:lab2 }
-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::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/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 5b974ce..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.0/32
-set interface ip address loop0 2001:678:d78:220::/128
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp
deleted file mode 100644
index 1e73a8f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-0 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/mpls.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 0f2a444..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/sflow.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/disable-bird b/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
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
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
deleted file mode 100644
index 438aa0d..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-0</name>
-  <uuid>d1414a92-a6bc-c013-0f8a-b668c50f5ec3</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:00'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/daemons b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/frr.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/frr.conf
deleted file mode 100644
index b5be340..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/frr/frr.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-hostname vpp2-1
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.12.1
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.12.1
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.12.1
-  label local advertise explicit-null
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:220::1
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/hostname b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/hostname
deleted file mode 100644
index 2191de4..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-1
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/hosts b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/hosts
deleted file mode 100644
index af6e872..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-1.lab.ipng.ch  vpp2-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/motd b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 0d9a02a..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.31/24, 2001:678:d78:50b::1f/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/flowprobe.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 5816f6c..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.1 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp
deleted file mode 100644
index de0b6ee..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +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/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 0b1ed03..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.1/32
-set interface ip address loop0 2001:678:d78:220::1/128
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp
deleted file mode 100644
index e032bea..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-1 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/mpls.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/sflow.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/disable-bird b/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
deleted file mode 100644
index 8804acc..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-1</name>
-  <uuid>c255cbc3-2055-76b6-38e6-38c020711b3f</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:10'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/daemons b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/frr.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/frr.conf
deleted file mode 100644
index 9070006..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/frr/frr.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-hostname vpp2-2
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.12.2
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.12.2
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.12.2
-  label local advertise explicit-null
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:220::2
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/hostname b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/hostname
deleted file mode 100644
index 7c813a8..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-2
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/hosts b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/hosts
deleted file mode 100644
index d0477cf..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-2.lab.ipng.ch  vpp2-2
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/motd b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 87f1aea..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.32/24, 2001:678:d78:50b::20/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/flowprobe.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 463b0b7..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.2 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp
deleted file mode 100644
index 027b8b7..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +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/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 90a007f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.2/32
-set interface ip address loop0 2001:678:d78:220::2/128
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp
deleted file mode 100644
index ad5c6e9..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-2 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/mpls.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/sflow.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/disable-bird b/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ 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
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
deleted file mode 100644
index b04f6bf..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-2/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-2</name>
-  <uuid>2c8a4f0e-8d5a-3f2e-0bb7-2373386fd066</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-2'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:20'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-2-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:20'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:21'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:22'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:23'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-2-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/daemons b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ 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
deleted file mode 100644
index f5cb568..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/frr/frr.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-hostname vpp2-3
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.12.3
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.12.3
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.12.3
-  label local advertise explicit-null
-  !
-  interface e0
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:220::3
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e0
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/hostname b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/hostname
deleted file mode 100644
index 773dc59..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp2-3
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/hosts b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/hosts
deleted file mode 100644
index c4cf2c4..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp2-3.lab.ipng.ch  vpp2-3
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/motd b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index 93c17ae..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 2383d6a..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.33/24, 2001:678:d78:50b::21/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/flowprobe.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 024197c..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.12.3 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp
deleted file mode 100644
index 2c747b6..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-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
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 5df6b09..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.12.3/32
-set interface ip address loop0 2001:678:d78:220::3/128
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp
deleted file mode 100644
index 84c9672..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp2-3 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/mpls.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/mpls.vpp
deleted file mode 100644
index ed52371..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/sflow.vpp b/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys b/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/disable-bird b/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
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
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/root/libvirt.xml b/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
deleted file mode 100644
index 65850bd..0000000
--- a/build/frr/hvn2.lab.ipng.ch/vpp2-3/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp2-3</name>
-  <uuid>369c5302-e6f1-5120-f48d-6931012dda01</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp2-3'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:01:30'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp2-3-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:30'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:31'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:32'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:11:33'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp2-3-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/hostname b/build/frr/hvn3.lab.ipng.ch/host3-0/etc/hostname
deleted file mode 100644
index 8bbe1ea..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host3-0
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/hosts b/build/frr/hvn3.lab.ipng.ch/host3-0/etc/hosts
deleted file mode 100644
index 5f026c2..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host3-0.lab.ipng.ch  host3-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/motd b/build/frr/hvn3.lab.ipng.ch/host3-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/netns/dataplane/resolv.conf b/build/frr/hvn3.lab.ipng.ch/host3-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/netplan/01-netcfg.yaml b/build/frr/hvn3.lab.ipng.ch/host3-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 3bdb808..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.41/24, 2001:678:d78:50b::29/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/resolv.conf b/build/frr/hvn3.lab.ipng.ch/host3-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/home/ipng/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/host3-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/root/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/host3-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/root/lab-build/disable-vpp b/build/frr/hvn3.lab.ipng.ch/host3-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-0/root/lab-build/perms b/build/frr/hvn3.lab.ipng.ch/host3-0/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
deleted file mode 100644
index 2045c1e..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host3-0</name>
-  <uuid>11b2b960-0e94-93fe-d6ad-af614fd90c18</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host3-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:00:00'/>
-      <source bridge='mgmt'/>
-      <target dev='host3-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/hostname b/build/frr/hvn3.lab.ipng.ch/host3-1/etc/hostname
deleted file mode 100644
index 4db59e6..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-host3-1
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/hosts b/build/frr/hvn3.lab.ipng.ch/host3-1/etc/hosts
deleted file mode 100644
index 3c89d9d..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host3-1.lab.ipng.ch  host3-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/motd b/build/frr/hvn3.lab.ipng.ch/host3-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/netns/dataplane/resolv.conf b/build/frr/hvn3.lab.ipng.ch/host3-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/netplan/01-netcfg.yaml b/build/frr/hvn3.lab.ipng.ch/host3-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 0923e13..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.42/24, 2001:678:d78:50b::2a/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/resolv.conf b/build/frr/hvn3.lab.ipng.ch/host3-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/home/ipng/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/host3-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/root/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/host3-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/root/lab-build/disable-vpp b/build/frr/hvn3.lab.ipng.ch/host3-1/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/host3-1/root/lab-build/perms b/build/frr/hvn3.lab.ipng.ch/host3-1/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
deleted file mode 100644
index 034f3cd..0000000
--- a/build/frr/hvn3.lab.ipng.ch/host3-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>host3-1</name>
-  <uuid>7ac59a4c-9cd2-391f-1a64-0fe9759efd39</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host3-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:00:10'/>
-      <source bridge='mgmt'/>
-      <target dev='host3-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:10:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host3-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/hostname b/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/hostname
deleted file mode 100644
index 17180f9..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-tap3-0
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/hosts b/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/hosts
deleted file mode 100644
index 6ac5657..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       tap3-0.lab.ipng.ch  tap3-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/motd b/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/netns/dataplane/resolv.conf b/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/netplan/01-netcfg.yaml b/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index cf54e57..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.43/24, 2001:678:d78:50b::2b/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/rc.local b/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/rc.local
deleted file mode 100644
index 08e364f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/rc.local
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-ip link set enp16s0f0 alias mirror-rx mtu 9216 up
-ip link set enp16s0f1 alias mirror-tx mtu 9216 up
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/resolv.conf b/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/home/ipng/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/tap3-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/tap3-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/lab-build/disable-vpp b/build/frr/hvn3.lab.ipng.ch/tap3-0/root/lab-build/disable-vpp
deleted file mode 100644
index 3d56a99..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/lab-build/disable-vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/lab-build/perms b/build/frr/hvn3.lab.ipng.ch/tap3-0/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
deleted file mode 100644
index 2ddab08..0000000
--- a/build/frr/hvn3.lab.ipng.ch/tap3-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>tap3-0</name>
-  <uuid>241cda7a-487a-1b93-d6c9-cf0315d4c6ba</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/tap3-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:02:00'/>
-      <source bridge='mgmt'/>
-      <target dev='tap3-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:12:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='tap3-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/frr/daemons b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/frr/frr.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/frr/frr.conf
deleted file mode 100644
index eff5c1b..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/frr/frr.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-hostname vpp3-0
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.13.0
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.13.0
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.13.0
-  label local advertise explicit-null
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:230::
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/hostname b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/hostname
deleted file mode 100644
index 0cfe4bb..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-0
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/hosts b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/hosts
deleted file mode 100644
index baf45c2..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-0.lab.ipng.ch  vpp3-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/motd b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/netns/dataplane/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/netplan/01-netcfg.yaml b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index d04f884..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.37/24, 2001:678:d78:50b::25/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/bootstrap.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/defaults.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/flowprobe.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 8637529..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.0 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/interface.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/interface.vpp
deleted file mode 100644
index 7a2e48e..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to lab.ipng.ch:lab3 }
-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:231::0:fffe/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.5/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp3-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:231::1:30/112
-set interface ip address GigabitEthernet10/0/1 192.168.13.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/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/lcp.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/loopback.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 3a2ae5e..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.0/32
-set interface ip address loop0 2001:678:d78:230::/128
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/manual.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/manual.vpp
deleted file mode 100644
index 8ebfad9..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-0 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/mpls.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 0f2a444..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/sflow.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/home/ipng/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-0/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/disable-bird b/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/perms b/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
deleted file mode 100644
index 64a7bf2..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-0/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-0</name>
-  <uuid>a36fc4b6-482b-f6e6-4e97-a81aea18d350</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:00'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/frr/daemons b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/frr/frr.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/frr/frr.conf
deleted file mode 100644
index a564dd0..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/frr/frr.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-hostname vpp3-1
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.13.1
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.13.1
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.13.1
-  label local advertise explicit-null
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:230::1
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/hostname b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/hostname
deleted file mode 100644
index 14db931..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-1
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/hosts b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/hosts
deleted file mode 100644
index 4fca03a..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-1.lab.ipng.ch  vpp3-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/motd b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/netns/dataplane/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/netplan/01-netcfg.yaml b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index cb54e0e..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.38/24, 2001:678:d78:50b::26/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/bootstrap.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/defaults.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/flowprobe.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 33ccbe2..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.1 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/interface.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/interface.vpp
deleted file mode 100644
index 1bbd96e..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to vpp3-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:231::1:31/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.7/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp3-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:231::2:31/112
-set interface ip address GigabitEthernet10/0/1 192.168.13.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/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/lcp.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/loopback.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 041b3e9..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.1/32
-set interface ip address loop0 2001:678:d78:230::1/128
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/manual.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/manual.vpp
deleted file mode 100644
index f5d8e83..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-1 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/mpls.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/sflow.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/home/ipng/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-1/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/disable-bird b/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/perms b/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
deleted file mode 100644
index b997458..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-1/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-1</name>
-  <uuid>a854479d-054d-ed9b-187a-cc828c1948cb</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-1'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:10'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-1-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:10'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:11'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:12'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:13'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-1-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/frr/daemons b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/frr/frr.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/frr/frr.conf
deleted file mode 100644
index 999e857..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/frr/frr.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-hostname vpp3-2
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.13.2
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.13.2
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.13.2
-  label local advertise explicit-null
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:230::2
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e0
-  exit
-  !
-  interface e1
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/hostname b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/hostname
deleted file mode 100644
index 443623e..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-2
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/hosts b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/hosts
deleted file mode 100644
index add35de..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-2.lab.ipng.ch  vpp3-2
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/motd b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/netns/dataplane/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/netplan/01-netcfg.yaml b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index 5d38b12..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.39/24, 2001:678:d78:50b::27/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/bootstrap.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/defaults.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/flowprobe.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index 0ff4d98..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.2 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/interface.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/interface.vpp
deleted file mode 100644
index 91b5986..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,24 +0,0 @@
-comment { Gi10/0/0 is connected to vpp3-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:231::2:32/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.9/31
-set interface state GigabitEthernet10/0/0 up
-
-comment { Gi10/0/1 is connected to vpp3-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:231::3:32/112
-set interface ip address GigabitEthernet10/0/1 192.168.13.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/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/lcp.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/loopback.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/loopback.vpp
deleted file mode 100644
index 2e89d76..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.2/32
-set interface ip address loop0 2001:678:d78:230::2/128
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/manual.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/manual.vpp
deleted file mode 100644
index 6572009..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-2 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/mpls.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/mpls.vpp
deleted file mode 100644
index 2ba18c5..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,3 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
-set interface mpls GigabitEthernet10/0/1 enable
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/sflow.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/home/ipng/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-2/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/disable-bird b/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/perms b/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
deleted file mode 100644
index cdec6b2..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-2/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-2</name>
-  <uuid>c38d74b3-4c80-e3b6-1085-661946f8d383</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-2'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:20'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-2-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:20'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:21'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:22'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:23'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-2-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/frr/daemons b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/frr/daemons
deleted file mode 100644
index d17f465..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/frr/daemons
+++ /dev/null
@@ -1,15 +0,0 @@
-bgpd=yes
-ospfd=yes
-ospf6d=yes
-bfdd=yes
-ldpd=yes
-
-vtysh_enable=yes
-watchfrr_options="--netns=dataplane"
-zebra_options="  -A 127.0.0.1 -s 67108864 -M dplane_fpm_nl"
-bgpd_options="   -A 127.0.0.1"
-ospfd_options="  -A 127.0.0.1"
-ospf6d_options=" -A ::1"
-staticd_options="-A 127.0.0.1"
-bfdd_options="   -A 127.0.0.1"
-ldpd_options="   -A 127.0.0.1"
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/frr/frr.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/frr/frr.conf
deleted file mode 100644
index 6c4ebee..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/frr/frr.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-hostname vpp3-3
-log syslog informational
-no ip forwarding
-no ipv6 forwarding
-service integrated-vtysh-config
-!
-ip router-id 192.168.13.3
-!
-interface e0
- ip ospf area 0
- ip ospf network point-to-point
- ipv6 ospf6 area 0
- ipv6 ospf6 network point-to-point
- mpls enable
-exit
-!
-interface e1
-exit
-!
-interface loop0
- ip ospf area 0
- ip ospf passive
- ipv6 ospf6 area 0
- ipv6 ospf6 passive
-exit
-!
-router ospf
- distribute connected
- disrtibute static
-exit
-!
-router ospf6
- distribute connected
- disrtibute static
-exit
-!
-mpls ldp
- router-id 192.168.13.3
- dual-stack cisco-interop
- ordered-control
- !
- address-family ipv4
-  discovery transport-address 192.168.13.3
-  label local advertise explicit-null
-  !
-  interface e0
-  exit
-  !
- exit-address-family
- !
- address-family ipv6
-  discovery transport-address 2001:678:d78:230::3
-  label local advertise explicit-null
-  ttl-security disable
-  !
-  interface e0
-  exit
-  !
- exit-address-family
- !
-exit
-!
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/hostname b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/hostname
deleted file mode 100644
index a8c1fa8..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/hostname
+++ /dev/null
@@ -1 +0,0 @@
-vpp3-3
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/hosts b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/hosts
deleted file mode 100644
index bcf73b6..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/hosts
+++ /dev/null
@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       vpp3-3.lab.ipng.ch  vpp3-3
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/motd b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/motd
deleted file mode 100644
index 56a5416..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/motd
+++ /dev/null
@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/netns/dataplane/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/netns/dataplane/resolv.conf
deleted file mode 100644
index c389147..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/netns/dataplane/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.13.4
-nameserver 2001:678:d78:231::ffff
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/netplan/01-netcfg.yaml b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/netplan/01-netcfg.yaml
deleted file mode 100644
index bd34152..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/netplan/01-netcfg.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.40/24, 2001:678:d78:50b::28/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/resolv.conf b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/resolv.conf
deleted file mode 100644
index 6d35b25..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/resolv.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/bootstrap.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/bootstrap.vpp
deleted file mode 100644
index d1e8885..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/bootstrap.vpp
+++ /dev/null
@@ -1,12 +0,0 @@
-comment { Apply system defaults from the build }
-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
-exec /etc/vpp/config/sflow.vpp
-
-comment { exec /etc/vpp/config/flowprobe.vpp }
-
-comment { Allow user to set persistent manual configs }
-exec /etc/vpp/config/manual.vpp
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/defaults.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/defaults.vpp
deleted file mode 100644
index dde7dbf..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/defaults.vpp
+++ /dev/null
@@ -1,5 +0,0 @@
-set logging class linux-cp rate-limit 1000 level warn syslog-level notice
-lcp default netns dataplane
-lcp lcp-sync on
-lcp lcp-auto-subint off
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/flowprobe.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/flowprobe.vpp
deleted file mode 100644
index e855e3c..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/flowprobe.vpp
+++ /dev/null
@@ -1,10 +0,0 @@
-comment { Generate full IPFIX stats, send them to lab.ipng.ch }
-
-set ipfix exporter collector 194.1.163.86 src 192.168.13.3 port 4739 path-mtu 1450 template-interval 30
-
-flowprobe params record l2 l3 l4 active 10 passive 60
-
-flowprobe feature add-del GigabitEthernet10/0/0 l2 both
-flowprobe feature add-del GigabitEthernet10/0/1 l2 both
-flowprobe feature add-del GigabitEthernet10/0/2 l2 both
-flowprobe feature add-del GigabitEthernet10/0/3 l2 both
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/interface.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/interface.vpp
deleted file mode 100644
index 2cb2762..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/interface.vpp
+++ /dev/null
@@ -1,22 +0,0 @@
-comment { Gi10/0/0 is connected to vpp3-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:231::3:33/112
-set interface ip address GigabitEthernet10/0/0 192.168.13.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/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/lcp.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/lcp.vpp
deleted file mode 100644
index b0fcea1..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/lcp.vpp
+++ /dev/null
@@ -1,7 +0,0 @@
-comment { Create one LinuxCP Interface Pair for each phy }
-lcp create loop0 host-if loop0
-lcp create GigabitEthernet10/0/0 host-if e0
-lcp create GigabitEthernet10/0/1 host-if e1
-lcp create GigabitEthernet10/0/2 host-if e2
-lcp create GigabitEthernet10/0/3 host-if e3
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/loopback.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/loopback.vpp
deleted file mode 100644
index ff79b64..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/loopback.vpp
+++ /dev/null
@@ -1,6 +0,0 @@
-comment { Create a loopback interface }
-create loopback interface instance 0
-set interface state loop0 up
-set interface ip address loop0 192.168.13.3/32
-set interface ip address loop0 2001:678:d78:230::3/128
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/manual.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/manual.vpp
deleted file mode 100644
index b126274..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/manual.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-comment { Put any config for vpp3-3 you'd like here. }
-comment { It will persist across restarts of VPP and reboots of the VM. }
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/mpls.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/mpls.vpp
deleted file mode 100644
index ed52371..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/mpls.vpp
+++ /dev/null
@@ -1,2 +0,0 @@
-mpls table add 0
-set interface mpls GigabitEthernet10/0/0 enable
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/sflow.vpp b/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/sflow.vpp
deleted file mode 100644
index 5b71e18..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/sflow.vpp
+++ /dev/null
@@ -1,8 +0,0 @@
-sflow header-bytes 128
-sflow sampling-rate 100
-sflow polling-interval 10
-
-sflow enable GigabitEthernet10/0/0
-sflow enable GigabitEthernet10/0/1
-sflow enable GigabitEthernet10/0/2
-sflow enable GigabitEthernet10/0/3
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/home/ipng/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-3/home/ipng/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/home/ipng/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/.ssh/authorized_keys b/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/.ssh/authorized_keys
deleted file mode 100644
index 331e254..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/.ssh/authorized_keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/disable-bird b/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/disable-bird
deleted file mode 100644
index 59cc242..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/disable-bird
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling Bird"
-for i in bird-dataplane; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done
\ No newline at end of file
diff --git a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/perms b/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/perms
deleted file mode 100644
index c44e66f..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/lab-build/perms
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-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/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml b/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
deleted file mode 100644
index 4f36b45..0000000
--- a/build/frr/hvn3.lab.ipng.ch/vpp3-3/root/libvirt.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<domain type='kvm'>
-  <name>vpp3-3</name>
-  <uuid>d47cd1ce-7eb3-ba5c-275e-261797ae11cb</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='host-passthrough'/>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/vpp3-3'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:01:30'/>
-      <source bridge='mgmt'/>
-      <target dev='vpp3-3-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:30'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:31'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:32'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F3:11:33'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vpp3-3-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>
diff --git a/config/hvn2.lab.ipng.ch.yaml b/config/hvn2.lab.ipng.ch.yaml
deleted file mode 100644
index 2ab7d88..0000000
--- a/config/hvn2.lab.ipng.ch.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-lab:
-  id: 2
-  ipv4: 192.168.12.0/24
-  ipv6: 2001:678:d78:220::/60
-  nameserver: 
-    addresses: [ 192.168.12.4, 2001:678:d78:221::ffff ]
-  hypervisor: hvn2.lab.ipng.ch
diff --git a/config/hvn3.lab.ipng.ch.yaml b/config/hvn3.lab.ipng.ch.yaml
deleted file mode 100644
index 5c5ee2e..0000000
--- a/config/hvn3.lab.ipng.ch.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-lab:
-  id: 3
-  ipv4: 192.168.13.0/24
-  ipv6: 2001:678:d78:230::/60
-  nameserver: 
-    addresses: [ 192.168.13.4, 2001:678:d78:231::ffff ]
-  hypervisor: hvn3.lab.ipng.ch
diff --git a/generate-all b/generate-all
index badbf94..0f436e6 100755
--- a/generate-all
+++ b/generate-all
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 for o in frr bird; do 
-  for i in `seq 0 3`; do 
-    ./generate --host hvn$i.lab.ipng.ch --overlay $o
+  for i in 0 1; do
+    ./generate -d --host hvn$i.lab.ipng.ch --overlay $o
   done
 done