diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp
index cfc9c1a..343dd35 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.0/32
+set interface ip address loop0 2001:678:d78:200::/128
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp
index 2d275be..4ae0b98 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.1/32
+set interface ip address loop0 2001:678:d78:200::1/128
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp
index c77093f..6148ae4 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.2/32
+set interface ip address loop0 2001:678:d78:200::2/128
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp
index bc0dc6f..5f952fd 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.3/32
+set interface ip address loop0 2001:678:d78:200::3/128
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
index 008d9e1..a25cae3 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.0/32
+set interface ip address loop0 2001:678:d78:210::/128
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
index 01d239b..3265535 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.1/32
+set interface ip address loop0 2001:678:d78:210::1/128
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
index c45d98c..792cfab 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.2/32
+set interface ip address loop0 2001:678:d78:210::2/128
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
index 4968272..8d47ac7 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.3/32
+set interface ip address loop0 2001:678:d78:210::3/128
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp
index cfc9c1a..343dd35 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.0/32
+set interface ip address loop0 2001:678:d78:200::/128
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp
index 2d275be..4ae0b98 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.1/32
+set interface ip address loop0 2001:678:d78:200::1/128
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp
index c77093f..6148ae4 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.2/32
+set interface ip address loop0 2001:678:d78:200::2/128
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp
index bc0dc6f..5f952fd 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.3/32
+set interface ip address loop0 2001:678:d78:200::3/128
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
index 008d9e1..a25cae3 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.0/32
+set interface ip address loop0 2001:678:d78:210::/128
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
index 01d239b..3265535 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.1/32
+set interface ip address loop0 2001:678:d78:210::1/128
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
index c45d98c..792cfab 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.2/32
+set interface ip address loop0 2001:678:d78:210::2/128
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
index 4968272..8d47ac7 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp
@@ -2,3 +2,4 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.3/32
+set interface ip address loop0 2001:678:d78:210::3/128
diff --git a/generate-all b/generate-all
index 0f436e6..13bcfd6 100755
--- a/generate-all
+++ b/generate-all
@@ -2,7 +2,7 @@
 
 for o in frr bird; do 
   for i in 0 1; do
-    ./generate -d --host hvn$i.lab.ipng.ch --overlay $o
+    ./generate --host hvn$i.lab.ipng.ch --overlay $o $*
   done
 done
 
diff --git a/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2
index d1965c0..3aea22f 100644
--- a/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2
+++ b/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2
@@ -2,4 +2,5 @@ comment { Create a loopback interface }
 create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 {{ node.loopback.ipv4 }}
+set interface ip address loop0 {{ node.loopback.ipv6 }}