diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index cc3632db3dd9cb5b820256f59347fbf55990c2f3..4f654bba67bf8261ec6b50c85c051a78945fddb0 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-base
 pkgver=3.17_alpha20220809
-pkgrel=1
+pkgrel=2
 pkgdesc="Meta package for minimal alpine base"
 url="https://alpinelinux.org"
 arch="noarch"
 license="MIT"
-depends="alpine-baselayout alpine-conf apk-tools busybox busybox-suid busybox-initscripts
-	openrc libc-utils alpine-release"
+depends="alpine-baselayout alpine-conf apk-tools busybox busybox-suid busybox-openrc
+	openrc libc-utils alpine-keys"
 makedepends=""
 install=""
 subpackages="alpine-release:release"
diff --git a/main/busybox-initscripts/busybox-initscripts.post-install b/main/busybox-initscripts/busybox-initscripts.post-install
deleted file mode 100644
index c393627437f2e5387a21ce8975d0b9658199ab12..0000000000000000000000000000000000000000
--- a/main/busybox-initscripts/busybox-initscripts.post-install
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# this is for upgraders
-addgroup -S -g 23 input 2>/dev/null
-
-# this is for upgraders
-if [ -L /etc/runlevels/boot/mdev ] && ! [ -L /etc/runlevels/sysinit/mdev ]; then
-	mkdir -p /etc/runlevels/sysinit
-	mv /etc/runlevels/boot/mdev /etc/runlevels/sysinit/ 2>/dev/null
-fi
-
-rename_service() {
-	oldname="$1"
-	newname="$2"
-
-	ret=1
-	for link in /run/openrc/*/${oldname} /etc/runlevels/*/${oldname}; do
-		newlink="${link%/*}/${newname}"
-		if [ -L "$link" ] && ! [ -L "$newlink" ]; then
-			target="$(readlink $link)"
-			ln -s "${target%/*}/$newname" "$newlink"
-			rm "$link"
-			ret=0
-			continue
-		fi
-		if [ -d "$link" ] && ! [ -d "$newlink" ]; then
-			mv "$link" "$newlink"
-			ret=0
-		fi
-	done
-
-	return $ret
-}
-
-# cron was renamed to crond
-rename_service cron crond
-
-# keymaps was renamed to loadkmap
-rename_service keymaps loadkmap && cat 1>&2 <<-EOF
-*
-* The OpenRC keymaps service was renamed to loadkmap. You might want
-* to rename your previous configuration file /etc/conf.d/keymaps to
-* /etc/conf.d/loadkmap. Also make sure that /etc/init.d/keymaps was
-* removed and remove it manually if it wasn't.
-*
-EOF
-
-exit 0
-
diff --git a/main/busybox-initscripts/busybox-initscripts.post-upgrade b/main/busybox-initscripts/busybox-initscripts.post-upgrade
deleted file mode 120000
index ef17c50147200fc2f9c2570ee777268decf5fc08..0000000000000000000000000000000000000000
--- a/main/busybox-initscripts/busybox-initscripts.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-busybox-initscripts.post-install
\ No newline at end of file
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-openrc/APKBUILD
similarity index 93%
rename from main/busybox-initscripts/APKBUILD
rename to main/busybox-openrc/APKBUILD
index 418b61ad7425a7e01a1de193857d35cf9468ca2a..4c5de212404bd5d543f3e5f3aaea90afcef4e832 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-openrc/APKBUILD
@@ -1,16 +1,16 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=busybox-initscripts
-pkgver=4.2
-pkgrel=1
-pkgdesc="Init scripts for busybox daemons"
-url="https://git.alpinelinux.org/aports/tree/main/busybox-initscripts"
+pkgname=busybox-openrc
+pkgver=1.0
+pkgrel=0
+pkgdesc="Init scripts for miscellaneous services provided busybox"
+url="https://git.alpinelinux.org/aports/tree/main/busybox-openrc"
 arch="noarch"
 license="GPL-2.0-only"
 depends="busybox openrc>=0.24.1-r6 mdev-conf"
 makedepends=""
-install="$pkgname.post-install $pkgname.post-upgrade"
-replaces="alpine-baselayout openntpd"
+options="!check"
+replaces="alpine-baselayout openntpd busybox-initscripts"
 source="acpid.initd crond.initd dnsd.initd httpd.initd inetd.initd klogd.initd
 	mdev.initd ntpd.initd rdate.initd syslog.initd udhcpd.initd loadkmap.initd
 	watchdog.initd crond.confd klogd.confd ntpd.confd rdate.confd syslog.confd
diff --git a/main/busybox-initscripts/acpid.initd b/main/busybox-openrc/acpid.initd
similarity index 100%
rename from main/busybox-initscripts/acpid.initd
rename to main/busybox-openrc/acpid.initd
diff --git a/main/busybox-initscripts/crond.confd b/main/busybox-openrc/crond.confd
similarity index 100%
rename from main/busybox-initscripts/crond.confd
rename to main/busybox-openrc/crond.confd
diff --git a/main/busybox-initscripts/crond.initd b/main/busybox-openrc/crond.initd
similarity index 100%
rename from main/busybox-initscripts/crond.initd
rename to main/busybox-openrc/crond.initd
diff --git a/main/busybox-initscripts/dnsd.initd b/main/busybox-openrc/dnsd.initd
similarity index 100%
rename from main/busybox-initscripts/dnsd.initd
rename to main/busybox-openrc/dnsd.initd
diff --git a/main/busybox-initscripts/httpd.initd b/main/busybox-openrc/httpd.initd
similarity index 100%
rename from main/busybox-initscripts/httpd.initd
rename to main/busybox-openrc/httpd.initd
diff --git a/main/busybox-initscripts/inetd.initd b/main/busybox-openrc/inetd.initd
similarity index 100%
rename from main/busybox-initscripts/inetd.initd
rename to main/busybox-openrc/inetd.initd
diff --git a/main/busybox-initscripts/klogd.confd b/main/busybox-openrc/klogd.confd
similarity index 100%
rename from main/busybox-initscripts/klogd.confd
rename to main/busybox-openrc/klogd.confd
diff --git a/main/busybox-initscripts/klogd.initd b/main/busybox-openrc/klogd.initd
similarity index 100%
rename from main/busybox-initscripts/klogd.initd
rename to main/busybox-openrc/klogd.initd
diff --git a/main/busybox-initscripts/loadkmap.confd b/main/busybox-openrc/loadkmap.confd
similarity index 100%
rename from main/busybox-initscripts/loadkmap.confd
rename to main/busybox-openrc/loadkmap.confd
diff --git a/main/busybox-initscripts/loadkmap.initd b/main/busybox-openrc/loadkmap.initd
similarity index 100%
rename from main/busybox-initscripts/loadkmap.initd
rename to main/busybox-openrc/loadkmap.initd
diff --git a/main/busybox-initscripts/mdev.initd b/main/busybox-openrc/mdev.initd
similarity index 100%
rename from main/busybox-initscripts/mdev.initd
rename to main/busybox-openrc/mdev.initd
diff --git a/main/busybox-initscripts/ntpd.confd b/main/busybox-openrc/ntpd.confd
similarity index 100%
rename from main/busybox-initscripts/ntpd.confd
rename to main/busybox-openrc/ntpd.confd
diff --git a/main/busybox-initscripts/ntpd.initd b/main/busybox-openrc/ntpd.initd
similarity index 100%
rename from main/busybox-initscripts/ntpd.initd
rename to main/busybox-openrc/ntpd.initd
diff --git a/main/busybox-initscripts/rdate.confd b/main/busybox-openrc/rdate.confd
similarity index 100%
rename from main/busybox-initscripts/rdate.confd
rename to main/busybox-openrc/rdate.confd
diff --git a/main/busybox-initscripts/rdate.initd b/main/busybox-openrc/rdate.initd
similarity index 100%
rename from main/busybox-initscripts/rdate.initd
rename to main/busybox-openrc/rdate.initd
diff --git a/main/busybox-initscripts/syslog.confd b/main/busybox-openrc/syslog.confd
similarity index 100%
rename from main/busybox-initscripts/syslog.confd
rename to main/busybox-openrc/syslog.confd
diff --git a/main/busybox-initscripts/syslog.initd b/main/busybox-openrc/syslog.initd
similarity index 100%
rename from main/busybox-initscripts/syslog.initd
rename to main/busybox-openrc/syslog.initd
diff --git a/main/busybox-initscripts/udhcpd.initd b/main/busybox-openrc/udhcpd.initd
similarity index 100%
rename from main/busybox-initscripts/udhcpd.initd
rename to main/busybox-openrc/udhcpd.initd
diff --git a/main/busybox-initscripts/watchdog.confd b/main/busybox-openrc/watchdog.confd
similarity index 100%
rename from main/busybox-initscripts/watchdog.confd
rename to main/busybox-openrc/watchdog.confd
diff --git a/main/busybox-initscripts/watchdog.initd b/main/busybox-openrc/watchdog.initd
similarity index 100%
rename from main/busybox-initscripts/watchdog.initd
rename to main/busybox-openrc/watchdog.initd
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index d756a297fe18cda5f7a7f597a740f73b7051d17e..0955f4263da90ba1c1955e11219b25de451e68a6 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -121,7 +121,7 @@ package() {
 	# we use a virtual keymaps services to allow users to set their
 	# keymaps either with the OpenRC loadkeys service provided by
 	# the kbd aport or with the loadkmap service provided by the
-	# busybox-initscripts aport.
+	# busybox-openrc aport.
 	rm -f "$pkgdir/etc/init.d/keymaps" \
 		"$pkgdir/etc/conf.d/keymaps"