diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index 4c5be69..7460ed0 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.4
+pkgver=2.5
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
diff --git a/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mds.0 b/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mds
similarity index 100%
rename from main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mds.0
rename to main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mds
diff --git a/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mgr.0 b/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mgr
similarity index 100%
rename from main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mgr.0
rename to main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mgr
diff --git a/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mon.0 b/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mon
similarity index 100%
rename from main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mon.0
rename to main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mon
diff --git a/main/nnd-s6-services/rc/ceph.mds.0/flag-essential b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.boot
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mds.0/flag-essential
rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.boot
diff --git a/main/nnd-s6-services/rc/ceph.mgr.0/flag-essential b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.boot-efi
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mgr.0/flag-essential
rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.boot-efi
diff --git a/main/nnd-s6-services/rc/ceph.mon.0/flag-essential b/main/nnd-s6-services/rc/ceph.mds/dependencies.d/sysctl.kernel-hostname
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mon.0/flag-essential
rename to main/nnd-s6-services/rc/ceph.mds/dependencies.d/sysctl.kernel-hostname
diff --git a/main/nnd-s6-services/rc/ceph.mds.0/producer-for b/main/nnd-s6-services/rc/ceph.mds/producer-for
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mds.0/producer-for
rename to main/nnd-s6-services/rc/ceph.mds/producer-for
diff --git a/main/nnd-s6-services/rc/ceph.mds.0/run b/main/nnd-s6-services/rc/ceph.mds/run
similarity index 71%
rename from main/nnd-s6-services/rc/ceph.mds.0/run
rename to main/nnd-s6-services/rc/ceph.mds/run
index 9c88e69..56f875f 100755
--- a/main/nnd-s6-services/rc/ceph.mds.0/run
+++ b/main/nnd-s6-services/rc/ceph.mds/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 export DAEMON mds
-export ID 0
+backtick -D '0' ID hostname
 
 exec /usr/libexec/nnd/s6/ceph
diff --git a/main/nnd-s6-services/rc/ceph.mds.0/type b/main/nnd-s6-services/rc/ceph.mds/type
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mds.0/type
rename to main/nnd-s6-services/rc/ceph.mds/type
diff --git a/main/nnd-s6-services/rc/ceph.osd.0.block/flag-essential b/main/nnd-s6-services/rc/ceph.mgr/dependencies.d/sysctl.kernel-hostname
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.osd.0.block/flag-essential
rename to main/nnd-s6-services/rc/ceph.mgr/dependencies.d/sysctl.kernel-hostname
diff --git a/main/nnd-s6-services/rc/ceph.mgr.0/producer-for b/main/nnd-s6-services/rc/ceph.mgr/producer-for
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mgr.0/producer-for
rename to main/nnd-s6-services/rc/ceph.mgr/producer-for
diff --git a/main/nnd-s6-services/rc/ceph.mgr.0/run b/main/nnd-s6-services/rc/ceph.mgr/run
similarity index 71%
rename from main/nnd-s6-services/rc/ceph.mgr.0/run
rename to main/nnd-s6-services/rc/ceph.mgr/run
index ed4effc..cff8c5a 100755
--- a/main/nnd-s6-services/rc/ceph.mgr.0/run
+++ b/main/nnd-s6-services/rc/ceph.mgr/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 export DAEMON mgr
-export ID 0
+backtick -D '0' ID hostname
 
 exec /usr/libexec/nnd/s6/ceph
diff --git a/main/nnd-s6-services/rc/ceph.mgr.0/type b/main/nnd-s6-services/rc/ceph.mgr/type
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mgr.0/type
rename to main/nnd-s6-services/rc/ceph.mgr/type
diff --git a/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/flag-essential b/main/nnd-s6-services/rc/ceph.mon/dependencies.d/sysctl.kernel-hostname
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/flag-essential
rename to main/nnd-s6-services/rc/ceph.mon/dependencies.d/sysctl.kernel-hostname
diff --git a/main/nnd-s6-services/rc/ceph.mon.0/producer-for b/main/nnd-s6-services/rc/ceph.mon/producer-for
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mon.0/producer-for
rename to main/nnd-s6-services/rc/ceph.mon/producer-for
diff --git a/main/nnd-s6-services/rc/ceph.mon.0/run b/main/nnd-s6-services/rc/ceph.mon/run
similarity index 71%
rename from main/nnd-s6-services/rc/ceph.mon.0/run
rename to main/nnd-s6-services/rc/ceph.mon/run
index 17ca28d..32e5fe3 100755
--- a/main/nnd-s6-services/rc/ceph.mon.0/run
+++ b/main/nnd-s6-services/rc/ceph.mon/run
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 export DAEMON mon
-export ID 0
+backtick -D '0' ID hostname
 
 exec /usr/libexec/nnd/s6/ceph
diff --git a/main/nnd-s6-services/rc/ceph.mon.0/type b/main/nnd-s6-services/rc/ceph.mon/type
similarity index 100%
rename from main/nnd-s6-services/rc/ceph.mon.0/type
rename to main/nnd-s6-services/rc/ceph.mon/type
diff --git a/main/nnd-s6-services/rc/ceph.osd.0/flag-essential b/main/nnd-s6-services/rc/ceph.osd.0/flag-essential
deleted file mode 100644
index e69de29..0000000
diff --git a/main/nnd-s6-services/rc/logger.ceph/consumer-for b/main/nnd-s6-services/rc/logger.ceph/consumer-for
index 4fbd929..7107b3d 100644
--- a/main/nnd-s6-services/rc/logger.ceph/consumer-for
+++ b/main/nnd-s6-services/rc/logger.ceph/consumer-for
@@ -1,4 +1,4 @@
 ceph.osd.0
-ceph.mon.0
-ceph.mds.0
-ceph.mgr.0
+ceph.mon
+ceph.mds
+ceph.mgr
diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/flag-essential b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/flag-essential
deleted file mode 100644
index e69de29..0000000
diff --git a/main/nnd-s6-services/rc/radvd/flag-essential b/main/nnd-s6-services/rc/radvd/flag-essential
deleted file mode 100644
index e69de29..0000000
diff --git a/main/nnd-s6-services/rc/vg.Backplane/flag-essential b/main/nnd-s6-services/rc/vg.Backplane/flag-essential
deleted file mode 100644
index e69de29..0000000