From 9ead69a5f6d44707a39a59926628e9f008c3775a Mon Sep 17 00:00:00 2001
From: Pim van Pelt <pim@ipng.nl>
Date: Sat, 6 May 2023 19:55:16 +0000
Subject: [PATCH] Make SSH keys for root/ipng configurable, add vifino only for
 lab0

---
 .../host0-0/home/ipng/.ssh/authorized_keys               | 1 -
 .../hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys   | 1 -
 .../host0-1/home/ipng/.ssh/authorized_keys               | 1 -
 .../hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys   | 1 -
 .../tap0-0/home/ipng/.ssh/authorized_keys                | 1 -
 .../hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys    | 1 -
 .../vpp0-0/home/ipng/.ssh/authorized_keys                | 1 -
 .../hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys    | 1 -
 .../vpp0-1/home/ipng/.ssh/authorized_keys                | 1 -
 .../hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys    | 1 -
 .../vpp0-2/home/ipng/.ssh/authorized_keys                | 1 -
 .../hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys    | 1 -
 .../vpp0-3/home/ipng/.ssh/authorized_keys                | 1 -
 .../hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys    | 1 -
 .../host1-0/home/ipng/.ssh/authorized_keys               | 3 ---
 .../hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys   | 3 ---
 .../host1-1/home/ipng/.ssh/authorized_keys               | 3 ---
 .../hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys   | 3 ---
 .../tap1-0/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys    | 3 ---
 .../vpp1-0/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys    | 3 ---
 .../vpp1-1/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys    | 3 ---
 .../vpp1-2/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys    | 3 ---
 .../vpp1-3/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys    | 3 ---
 .../host2-0/home/ipng/.ssh/authorized_keys               | 3 ---
 .../hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys   | 3 ---
 .../host2-1/home/ipng/.ssh/authorized_keys               | 3 ---
 .../hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys   | 3 ---
 .../tap2-0/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys    | 3 ---
 .../vpp2-0/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys    | 3 ---
 .../vpp2-1/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys    | 3 ---
 .../vpp2-2/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys    | 3 ---
 .../vpp2-3/home/ipng/.ssh/authorized_keys                | 3 ---
 .../hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys    | 3 ---
 config/hvn0.lab.ipng.ch.yaml                             | 7 +++++++
 overlays/bird/common/home/ipng/.ssh/authorized_keys      | 9 +++++----
 overlays/bird/common/root/.ssh/authorized_keys           | 9 +++++----
 45 files changed, 17 insertions(+), 106 deletions(-)

diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/host0-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/host0-0/root/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/host0-1/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/host0-1/root/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/tap0-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/tap0-0/root/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys
index d3f3bc3..87bb73e 100644
--- a/build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys
+++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys
@@ -4,6 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/host1-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/host1-0/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/host1-1/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/host1-1/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/tap1-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/tap1-0/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys
+++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/host2-1/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/tap2-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/tap2-0/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
index d3f3bc3..331e254 100644
--- a/build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
+++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys
@@ -4,6 +4,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/config/hvn0.lab.ipng.ch.yaml b/config/hvn0.lab.ipng.ch.yaml
index 144a49a..0f481c6 100644
--- a/config/hvn0.lab.ipng.ch.yaml
+++ b/config/hvn0.lab.ipng.ch.yaml
@@ -5,3 +5,10 @@ lab:
   nameserver: 
     addresses: [ 192.168.10.4, 2001:678:d78:201::ffff ]
   hypervisor: hvn0.lab.ipng.ch
+  ssh:
+    ipng:
+     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
+     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
+    root:
+     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
+     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
diff --git a/overlays/bird/common/home/ipng/.ssh/authorized_keys b/overlays/bird/common/home/ipng/.ssh/authorized_keys
index 7ae4974..1d72d30 100644
--- a/overlays/bird/common/home/ipng/.ssh/authorized_keys
+++ b/overlays/bird/common/home/ipng/.ssh/authorized_keys
@@ -4,7 +4,8 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
-
+{% if lab.ssh is defined and 'ipng' in lab.ssh %}
+{% for key in lab.ssh.ipng | default([]) %}
+{{ key }}
+{% endfor %}
+{% endif %}
diff --git a/overlays/bird/common/root/.ssh/authorized_keys b/overlays/bird/common/root/.ssh/authorized_keys
index 7ae4974..b1ed276 100644
--- a/overlays/bird/common/root/.ssh/authorized_keys
+++ b/overlays/bird/common/root/.ssh/authorized_keys
@@ -4,7 +4,8 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
-# Adrian's keys
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBy+EhCiRTcHgltaagVozgnROBy5Mi6Qslb3oWavDLSh vifino@tschunk
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID0hWe+3ovnwlOSDgexq/jcfyBS/NLIb7lC0yTtOvKWL vifino@firestorm
-
+{% if lab.ssh is defined and 'root' in lab.ssh %}
+{% for key in lab.ssh.root | default ([]) %}
+{{ key }}
+{% endfor %}
+{% endif %}