diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/lab-build/sshd b/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/lab-build/sshd
deleted file mode 100644
index 52a4c83..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-0/root/lab-build/sshd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart
diff --git a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/lab-build/sshd b/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/lab-build/sshd
deleted file mode 100644
index 52a4c83..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/host2-1/root/lab-build/sshd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart
diff --git a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/lab-build/sshd b/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/lab-build/sshd
deleted file mode 100644
index 52a4c83..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/tap2-0/root/lab-build/sshd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/sshd b/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/sshd
deleted file mode 100644
index 52a4c83..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/sshd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/sshd b/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/sshd
deleted file mode 100644
index 52a4c83..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/sshd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/sshd b/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/sshd
deleted file mode 100644
index 52a4c83..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/sshd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart
diff --git a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/sshd b/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/sshd
deleted file mode 100644
index 52a4c83..0000000
--- a/build/freebsd/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/sshd
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart
diff --git a/overlays/_common/ovs-config.sh.j2 b/overlays/_common/ovs-config.sh
similarity index 100%
rename from overlays/_common/ovs-config.sh.j2
rename to overlays/_common/ovs-config.sh
diff --git a/overlays/bird/ovs-config.sh.j2 b/overlays/bird/ovs-config.sh.j2
deleted file mode 120000
index c51ee83..0000000
--- a/overlays/bird/ovs-config.sh.j2
+++ /dev/null
@@ -1 +0,0 @@
-../_common/ovs-config.sh.j2
\ No newline at end of file
diff --git a/overlays/frr/ovs-config.sh.j2 b/overlays/frr/ovs-config.sh.j2
deleted file mode 120000
index c51ee83..0000000
--- a/overlays/frr/ovs-config.sh.j2
+++ /dev/null
@@ -1 +0,0 @@
-../_common/ovs-config.sh.j2
\ No newline at end of file