diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netns/dataplane/resolv.conf
index 7d51134..c57a7ba 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.10.4
 nameserver 2001:678:d78:201::ffff
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml
index 9e37526..a60176c 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.80/24, 2001:678:d78:101::80/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.16/27, 2001:678:d78:50b::10/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netns/dataplane/resolv.conf
index 7d51134..c57a7ba 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.10.4
 nameserver 2001:678:d78:201::ffff
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml
index 37abb53..fc4ec93 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.81/24, 2001:678:d78:101::81/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.17/27, 2001:678:d78:50b::11/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netns/dataplane/resolv.conf
index 7d51134..c57a7ba 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.10.4
 nameserver 2001:678:d78:201::ffff
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml
index 47387c5..7fa290d 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.82/24, 2001:678:d78:101::82/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.18/27, 2001:678:d78:50b::12/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netns/dataplane/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netns/dataplane/resolv.conf
index 7d51134..c57a7ba 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.10.4
 nameserver 2001:678:d78:201::ffff
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml
index e5ebfd4..3983163 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.83/24, 2001:678:d78:101::83/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.19/27, 2001:678:d78:50b::13/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf
index 7812d4d..3411fcd 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.11.4
 nameserver 2001:678:d78:211::ffff
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml
index 581a008..8fded0e 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.84/24, 2001:678:d78:101::84/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.20/27, 2001:678:d78:50b::14/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf
index 7812d4d..3411fcd 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.11.4
 nameserver 2001:678:d78:211::ffff
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml
index 808d899..befe8a1 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.85/24, 2001:678:d78:101::85/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.21/27, 2001:678:d78:50b::15/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf
index 7812d4d..3411fcd 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.11.4
 nameserver 2001:678:d78:211::ffff
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml
index 2cc6ef6..ad038c8 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.86/24, 2001:678:d78:101::86/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.22/27, 2001:678:d78:50b::16/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf
index 7812d4d..3411fcd 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.11.4
 nameserver 2001:678:d78:211::ffff
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml
index acc06fb..4fb9617 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.87/24, 2001:678:d78:101::87/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.23/27, 2001:678:d78:50b::17/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf
index 22cdc45..93c17ae 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.12.4
 nameserver 2001:678:d78:221::ffff
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml
index 2b69d98..c4c5bf9 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.88/24, 2001:678:d78:101::88/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.24/27, 2001:678:d78:50b::18/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf
index 22cdc45..93c17ae 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.12.4
 nameserver 2001:678:d78:221::ffff
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml
index a62d482..fbc2810 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.89/24, 2001:678:d78:101::89/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.25/27, 2001:678:d78:50b::19/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf
index 22cdc45..93c17ae 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.12.4
 nameserver 2001:678:d78:221::ffff
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml
index 120ff95..1d311f4 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.90/24, 2001:678:d78:101::8a/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.26/27, 2001:678:d78:50b::1a/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf
index 22cdc45..93c17ae 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netns/dataplane/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 192.168.12.4
 nameserver 2001:678:d78:221::ffff
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml
index 0b2dd13..a6c81c8 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/netplan/01-netcfg.yaml
@@ -6,6 +6,6 @@ network:
       optional: true
       accept-ra: false
       dhcp4: false
-      addresses: [ 192.168.1.91/24, 2001:678:d78:101::8b/64 ]
-      gateway4: 192.168.1.252
-      gateway6: 2001:678:d78:101::1
+      addresses: [ 198.19.5.27/27, 2001:678:d78:50b::1b/64 ]
+      gateway4: 198.19.5.1
+      gateway6: 2001:678:d78:50b::1
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
index ca1b910..6d35b25 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/resolv.conf
@@ -1,4 +1,4 @@
 domain lab.ipng.ch
-search lab.ipng.ch ipng.ch rfc1918.ipng.nl ipng.nl
+search lab.ipng.ch net.ipng.ch ipng.ch
 nameserver 194.1.163.3
 nameserver 194.1.163.4
diff --git a/config/common/generic.yaml b/config/common/generic.yaml
index b25c5c2..3004197 100644
--- a/config/common/generic.yaml
+++ b/config/common/generic.yaml
@@ -13,10 +13,10 @@ overlays:
 
 lab:
   mgmt:
-    ipv4: 192.168.1.80/24
-    ipv6: 2001:678:d78:101::80/64
-    gw4: 192.168.1.252
-    gw6: 2001:678:d78:101::1
+    ipv4: 198.19.5.16/27
+    ipv6: 2001:678:d78:50b::10/64
+    gw4: 198.19.5.1
+    gw6: 2001:678:d78:50b::1
   nameserver: 
-    search: [ "lab.ipng.ch", "ipng.ch", "rfc1918.ipng.nl", "ipng.nl" ]
+    search: [ "lab.ipng.ch", "net.ipng.ch", "ipng.ch" ]
   nodes: 4
diff --git a/create b/create
index 762cdbd..2aab79f 100755
--- a/create
+++ b/create
@@ -15,14 +15,14 @@
 ##     *  Unmount the staging directories
 ##     *  Start the VMs
 
-BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221128-release}
+BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20230403-release}
 BUILD=${BUILD:=default}
 LAB=${LAB:=0}
 
 ## Do not touch below this line
 LABDIR=/var/lab
 STAGING=$LABDIR/staging
-HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch"
+HVN="hvn${LAB}.lab.ipng.ch"
 
 echo "*  Cloning base"
 ssh root@$HVN "set -x; for node in 0 1 2 3; do VM=vpp${LAB}-\${node}; mkdir -p $STAGING/\$VM; zfs clone $BASE ssd-vol0/\$VM; done"
diff --git a/destroy b/destroy
index 4c914a1..e77d26a 100755
--- a/destroy
+++ b/destroy
@@ -13,7 +13,7 @@ BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221018-rele
 LAB=${LAB:=0}
 
 ## Do not touch below this line
-HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch"
+HVN="hvn${LAB}.lab.ipng.ch"
 
 echo "*  Destroying VMs"
 ssh root@$HVN "set -x; for node in 0 1 2 3; do VM=vpp${LAB}-\${node}; virsh destroy \$VM; done"
diff --git a/pristine b/pristine
index f85fbd8..887d3b1 100755
--- a/pristine
+++ b/pristine
@@ -3,7 +3,7 @@
 LAB=${LAB:=0}
 
 ## Do not touch below this line
-HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch"
+HVN="hvn${LAB}.lab.ipng.ch"
 
 ## Destroy the VMs and bring them back into pristine state
 echo "*  Restarting VMs from pristine snapshot"
diff --git a/virshall b/virshall
index bc8779d..dd1f6df 100755
--- a/virshall
+++ b/virshall
@@ -5,7 +5,7 @@ LAB=${LAB:=0}
 ## Do not touch below this line
 LABDIR=/var/lab
 STAGING=$LABDIR/staging
-HVN="hvn${LAB}-lab.chbtl0.net.ipng.ch"
+HVN="hvn${LAB}.lab.ipng.ch"
 CMD=$1
 
 [ "$CMD" != "start" -a "$CMD" != "shutdown" -a "$CMD" != "destroy" ] && {