diff --git a/main/nnd-s6-linux-init/APKBUILD b/main/nnd-s6-linux-init/APKBUILD
index c783415..aba3650 100644
--- a/main/nnd-s6-linux-init/APKBUILD
+++ b/main/nnd-s6-linux-init/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=nnd-s6-linux-init
-pkgver=1.1
+pkgver=1.2
 pkgrel=0
 pkgdesc="Skeleton for nnd-s6-services and symlinks"
 url="none"
@@ -13,6 +13,7 @@ makedepends="$depends"
 subpackages="
 	$pkgname-default:_default
 "
+options="!check"
 
 prepare() {
 	default_prepare
@@ -25,7 +26,9 @@ package() {
 }
 
 _default() {
+	# TODO: How do we distribute the default in apkv3?
 	local base="/etc/s6-linux-init"
+	depends="$depends nnd-s6-linux-init"
 
 	local \
 		skel="$pkgdir/$base/nnd-skel" \
diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index 26dda28..2985f80 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=nnd-s6-services
-pkgver=1.4
+pkgver=1.5
 pkgrel=0
 pkgdesc="Base services for s6"
 url="none"
diff --git a/main/nnd-s6-services/env/mount.boot-efi/SRC b/main/nnd-s6-services/env/mount.boot-efi/SRC
index ca3c31e..d9799a8 100644
--- a/main/nnd-s6-services/env/mount.boot-efi/SRC
+++ b/main/nnd-s6-services/env/mount.boot-efi/SRC
@@ -1 +1 @@
-LABEL=nnd-boot-efi
+LABEL=nnd-efi