diff --git a/build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/rc-local-perms b/build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/rc-local-perms b/build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-frr b/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-frr
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-frr b/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-frr
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-frr b/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-frr
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-frr b/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-frr
+++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/rc-local-perms b/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/rc-local-perms b/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-frr b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-frr
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-frr b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-frr
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-frr b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-frr
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-frr b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-frr
index f407e86..8771349 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-frr
+++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-frr
@@ -4,4 +4,9 @@ echo " * Disabling FRR"
 for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/rc-local-perms b/build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/frr/hvn0.lab.ipng.ch/host0-0/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/rc-local-perms b/build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/frr/hvn0.lab.ipng.ch/host0-1/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-bird b/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-bird
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-bird b/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-bird
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-bird b/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-bird
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-bird b/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-bird
+++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/rc-local-perms b/build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/frr/hvn1.lab.ipng.ch/host1-0/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/rc-local-perms b/build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/rc-local-perms
deleted file mode 100644
index ce5b509..0000000
--- a/build/frr/hvn1.lab.ipng.ch/host1-1/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-bird b/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-bird
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-bird b/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-bird
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-bird b/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-bird
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-bird b/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-bird
index 59cc242..d04416a 100644
--- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-bird
+++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-bird
@@ -4,4 +4,9 @@ echo " * Disabling Bird"
 for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
+done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
 done
\ No newline at end of file
diff --git a/overlays/_common/host/root/lab-build/rc-local-perms b/overlays/_common/host/root/lab-build/rc-local-perms
deleted file mode 100644
index cc19a13..0000000
--- a/overlays/_common/host/root/lab-build/rc-local-perms
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-echo "* Fixing permissions of rc.local"
-chmod 755 /etc/rc.local
-
diff --git a/overlays/bird/vpp/root/lab-build/disable-frr b/overlays/bird/vpp/root/lab-build/disable-frr
index 9588c23..420f215 100755
--- a/overlays/bird/vpp/root/lab-build/disable-frr
+++ b/overlays/bird/vpp/root/lab-build/disable-frr
@@ -5,3 +5,8 @@ for i in frr; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
 done
+
+echo " * Enabling Bird"
+for i in bird-dataplane; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
+done
diff --git a/overlays/frr/vpp/root/lab-build/disable-bird b/overlays/frr/vpp/root/lab-build/disable-bird
index 29a9814..868c97a 100755
--- a/overlays/frr/vpp/root/lab-build/disable-bird
+++ b/overlays/frr/vpp/root/lab-build/disable-bird
@@ -5,3 +5,8 @@ for i in bird-dataplane; do
   rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
   ln -sf /dev/null /etc/systemd/system/${i}.service
 done
+
+echo " * Enabling FRR"
+for i in frr; do
+  ln -sf /lib/systemd/system/${i}.service /etc/systemd/system/multi-user.target.wants/${i}.service
+done