diff --git a/build/default/vpp0-0/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bfd.conf
similarity index 100%
rename from build/default/vpp0-0/etc/bird/bfd.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bfd.conf
diff --git a/build/default/vpp0-0/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf
similarity index 100%
rename from build/default/vpp0-0/etc/bird/bird.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf
diff --git a/build/default/vpp0-0/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ibgp.conf
similarity index 100%
rename from build/default/vpp0-0/etc/bird/ibgp.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ibgp.conf
diff --git a/build/default/vpp0-0/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ospf.conf
similarity index 100%
rename from build/default/vpp0-0/etc/bird/ospf.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ospf.conf
diff --git a/build/default/vpp0-0/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/static.conf
similarity index 100%
rename from build/default/vpp0-0/etc/bird/static.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/static.conf
diff --git a/build/default/vpp0-0/etc/hostname b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/hostname
similarity index 100%
rename from build/default/vpp0-0/etc/hostname
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/hostname
diff --git a/build/default/vpp0-0/etc/hosts b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/hosts
similarity index 100%
rename from build/default/vpp0-0/etc/hosts
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/hosts
diff --git a/build/default/vpp0-0/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/vpp0-0/etc/netplan/01-netcfg.yaml
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/netplan/01-netcfg.yaml
diff --git a/build/default/vpp0-0/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp
similarity index 100%
rename from build/default/vpp0-0/etc/vpp/bootstrap.vpp
rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp
diff --git a/build/default/vpp0-1/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bfd.conf
similarity index 100%
rename from build/default/vpp0-1/etc/bird/bfd.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bfd.conf
diff --git a/build/default/vpp0-1/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf
similarity index 100%
rename from build/default/vpp0-1/etc/bird/bird.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf
diff --git a/build/default/vpp0-1/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ibgp.conf
similarity index 100%
rename from build/default/vpp0-1/etc/bird/ibgp.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ibgp.conf
diff --git a/build/default/vpp0-1/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ospf.conf
similarity index 100%
rename from build/default/vpp0-1/etc/bird/ospf.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ospf.conf
diff --git a/build/default/vpp0-1/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/static.conf
similarity index 100%
rename from build/default/vpp0-1/etc/bird/static.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/static.conf
diff --git a/build/default/vpp0-1/etc/hostname b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/hostname
similarity index 100%
rename from build/default/vpp0-1/etc/hostname
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/hostname
diff --git a/build/default/vpp0-1/etc/hosts b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/hosts
similarity index 100%
rename from build/default/vpp0-1/etc/hosts
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/hosts
diff --git a/build/default/vpp0-1/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/vpp0-1/etc/netplan/01-netcfg.yaml
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/netplan/01-netcfg.yaml
diff --git a/build/default/vpp0-1/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp
similarity index 100%
rename from build/default/vpp0-1/etc/vpp/bootstrap.vpp
rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp
diff --git a/build/default/vpp0-2/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bfd.conf
similarity index 100%
rename from build/default/vpp0-2/etc/bird/bfd.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bfd.conf
diff --git a/build/default/vpp0-2/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf
similarity index 100%
rename from build/default/vpp0-2/etc/bird/bird.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf
diff --git a/build/default/vpp0-2/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ibgp.conf
similarity index 100%
rename from build/default/vpp0-2/etc/bird/ibgp.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ibgp.conf
diff --git a/build/default/vpp0-2/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ospf.conf
similarity index 100%
rename from build/default/vpp0-2/etc/bird/ospf.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ospf.conf
diff --git a/build/default/vpp0-2/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/static.conf
similarity index 100%
rename from build/default/vpp0-2/etc/bird/static.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/static.conf
diff --git a/build/default/vpp0-2/etc/hostname b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/hostname
similarity index 100%
rename from build/default/vpp0-2/etc/hostname
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/hostname
diff --git a/build/default/vpp0-2/etc/hosts b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/hosts
similarity index 100%
rename from build/default/vpp0-2/etc/hosts
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/hosts
diff --git a/build/default/vpp0-2/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/vpp0-2/etc/netplan/01-netcfg.yaml
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/netplan/01-netcfg.yaml
diff --git a/build/default/vpp0-2/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp
similarity index 100%
rename from build/default/vpp0-2/etc/vpp/bootstrap.vpp
rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp
diff --git a/build/default/vpp0-3/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bfd.conf
similarity index 100%
rename from build/default/vpp0-3/etc/bird/bfd.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bfd.conf
diff --git a/build/default/vpp0-3/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf
similarity index 100%
rename from build/default/vpp0-3/etc/bird/bird.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf
diff --git a/build/default/vpp0-3/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ibgp.conf
similarity index 100%
rename from build/default/vpp0-3/etc/bird/ibgp.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ibgp.conf
diff --git a/build/default/vpp0-3/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ospf.conf
similarity index 100%
rename from build/default/vpp0-3/etc/bird/ospf.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ospf.conf
diff --git a/build/default/vpp0-3/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/static.conf
similarity index 100%
rename from build/default/vpp0-3/etc/bird/static.conf
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/static.conf
diff --git a/build/default/vpp0-3/etc/hostname b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/hostname
similarity index 100%
rename from build/default/vpp0-3/etc/hostname
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/hostname
diff --git a/build/default/vpp0-3/etc/hosts b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/hosts
similarity index 100%
rename from build/default/vpp0-3/etc/hosts
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/hosts
diff --git a/build/default/vpp0-3/etc/netplan/01-netcfg.yaml b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml
similarity index 100%
rename from build/default/vpp0-3/etc/netplan/01-netcfg.yaml
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/netplan/01-netcfg.yaml
diff --git a/build/default/vpp0-3/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp
similarity index 100%
rename from build/default/vpp0-3/etc/vpp/bootstrap.vpp
rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp
diff --git a/generate b/generate
index 32ef53c..00c2171 100755
--- a/generate
+++ b/generate
@@ -257,7 +257,7 @@ def main():
 
         # Emit the output (fn=>output)
         if not args.output and "build" in overlay:
-            output = overlay["build"] + data["node"]["hostname"]
+            output = overlay["build"] + args.hostname + "/" + data["node"]["hostname"]
         else:
             output = "-"
         emit(build, output)