diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index 6b166da..51ccdb6 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.16
+pkgver=2.20
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
diff --git a/main/nnd-s6-services/env/sysctl.net-ipv4.tcp_l3mdev_accept/VAL b/main/nnd-s6-services/env/sysctl.net-ipv4-tcp_l3mdev_accept/VAL
similarity index 100%
rename from main/nnd-s6-services/env/sysctl.net-ipv4.tcp_l3mdev_accept/VAL
rename to main/nnd-s6-services/env/sysctl.net-ipv4-tcp_l3mdev_accept/VAL
diff --git a/main/nnd-s6-services/env/sysctl.net-ipv4.udp_l3mdev_accept/VAL b/main/nnd-s6-services/env/sysctl.net-ipv4-udp_l3mdev_accept/VAL
similarity index 100%
rename from main/nnd-s6-services/env/sysctl.net-ipv4.udp_l3mdev_accept/VAL
rename to main/nnd-s6-services/env/sysctl.net-ipv4-udp_l3mdev_accept/VAL
diff --git a/main/nnd-s6-services/env/sysctl.net-ipv6-conf-default-keep_addr_on_down/VAL b/main/nnd-s6-services/env/sysctl.net-ipv6-conf-default-keep_addr_on_down/VAL
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/main/nnd-s6-services/env/sysctl.net-ipv6-conf-default-keep_addr_on_down/VAL
@@ -0,0 +1 @@
+1
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/dependencies.d/mount.proc
similarity index 100%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/dependencies.d/mount.proc
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/dependencies.d/mount.proc
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/down b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/down
similarity index 100%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/down
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/down
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/type b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/type
similarity index 100%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/type
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/type
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up
similarity index 60%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/up
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up
index cdd9008..707d9dd 100644
--- a/main/nnd-s6-services/rc/sysctl.net-ipv4.tcp_l3mdev_accept/up
+++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/sysctl.net-ipv4.tcp_l3mdev_accept
+s6-envdir -i /etc/s6/env/sysctl.net-ipv4-tcp_l3mdev_accept
 export SYSCTL net/ipv4/tcp_l3mdev_accept
 
 /usr/libexec/nnd/s6/sysctl
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/dependencies.d/mount.proc
similarity index 100%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/dependencies.d/mount.proc
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/dependencies.d/mount.proc
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/down b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/down
similarity index 100%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/down
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/down
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/type b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/type
similarity index 100%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/type
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/type
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up
similarity index 60%
rename from main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/up
rename to main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up
index 23769a6..83fd348 100644
--- a/main/nnd-s6-services/rc/sysctl.net-ipv4.udp_l3mdev_accept/up
+++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/sysctl.net-ipv4.udp_l3mdev_accept
+s6-envdir -i /etc/s6/env/sysctl.net-ipv4-udp_l3mdev_accept
 export SYSCTL net/ipv4/udp_l3mdev_accept
 
 /usr/libexec/nnd/s6/sysctl
diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.tcp_l3mdev_accept b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/dependencies.d/sysctl.net-ipv6-conf-default-keep_addr_on_down
similarity index 100%
rename from main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.tcp_l3mdev_accept
rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/dependencies.d/sysctl.net-ipv6-conf-default-keep_addr_on_down
diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.udp_l3mdev_accept b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/dependencies.d/module.ipv6
similarity index 100%
rename from main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4.udp_l3mdev_accept
rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/dependencies.d/module.ipv6
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/dependencies.d/mount.proc
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/down b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/down
new file mode 100644
index 0000000..c7a3c7c
--- /dev/null
+++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/down
@@ -0,0 +1,5 @@
+#!/bin/execlineb -P
+export SYSCTL net/ipv6/conf/default/keep_addr_on_down
+export VAL 0
+
+/usr/libexec/nnd/s6/sysctl
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/type b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/type
@@ -0,0 +1 @@
+oneshot
diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up
new file mode 100644
index 0000000..95d320b
--- /dev/null
+++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up
@@ -0,0 +1,6 @@
+#!/bin/execlineb -P
+export SYSCTL net/ipv6/conf/default/keep_addr_on_down
+
+s6-envdir -i /etc/s6/env/sysctl.net-ipv6-conf-default-keep_addr_on_down
+
+/usr/libexec/nnd/s6/sysctl
diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-tcp_l3mdev_accept b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-tcp_l3mdev_accept
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-udp_l3mdev_accept b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-udp_l3mdev_accept
new file mode 100644
index 0000000..e69de29