diff --git a/device/testing/device-samsung-a6lte/APKBUILD b/device/testing/device-samsung-a6lte/APKBUILD
index c76d75cfe..a963a9854 100644
--- a/device/testing/device-samsung-a6lte/APKBUILD
+++ b/device/testing/device-samsung-a6lte/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a6lte
 pkgdesc="Samsung Galaxy A6 2018"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,8 +20,6 @@ replaces="
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 source="
-	$pkgname.post-install
-	$pkgname-downstream-quirks.post-install
 	deviceinfo
 	etc-conf.d-samsungipcd
 	etc-init.d-hciattach-ttySAC0
@@ -37,10 +35,12 @@ source="
 	usr-share-wireplumber-wireplumber.conf.d-headroom.conf
 "
 subpackages="
+	$pkgname-openrc
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-downstream-quirks:downstream_quirks
+	$pkgname-downstream-quirks-openrc:downstream_quirks_openrc
 "
 
 # pulseaudio does not seem to work on this device. Will use pipewire-pulse instead.
@@ -53,7 +53,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 	install -Dm644 etc-conf.d-samsungipcd "$pkgdir"/etc/conf.d/samsungipcd
-	install -Dm755 etc-init.d-wlan0-up "$pkgdir"/etc/init.d/wlan0-up
 	install -Dm644 etc-lightdm-lightdm.conf "$pkgdir"/etc/lightdm/lightdm.conf
 	install -Dm755 usr-libexec-samsungipcd-voicecall.sh "$pkgdir"/usr/libexec/samsungipcd/voicecall.sh
 	install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/HiFi.conf
@@ -62,6 +61,11 @@ package() {
 	install -Dm644 usr-share-wireplumber-wireplumber.conf.d-headroom.conf "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d/headroom.conf
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install -Dm755 etc-init.d-wlan0-up "$subpkgdir"/etc/init.d/wlan0-up
+}
+
 kernel_downstream() {
 	pkgdesc="Working: display, touchscreen, wifi, bluetooth, audio, cellular"
 	depends="linux-samsung-a6lte msm-fb-refresher pipewire-pulse"
@@ -86,10 +90,7 @@ downstream_quirks() {
 	pkgdesc="Hacks to make the downstream kernel work"
 	depends="bluez-deprecated"
 	install_if="$pkgname-kernel-downstream"
-	replaces="bootmac udev-init-scripts-openrc"
-	install="$subpkgname.post-install"
-	install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle
-	install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0
+	replaces="bootmac"
 	install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf
 	install -Dm644 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf "$pkgdir"/etc/NetworkManager/conf.d/wlan0-preserve-mac.conf
 	# we run bootmac ourselves and don't want it to trigger from the udev rule
@@ -97,9 +98,15 @@ downstream_quirks() {
 	install -Dm755 /dev/null "$subpkgdir"/usr/lib/udev/rules.d/90-bootmac.rules
 }
 
+downstream_quirks_openrc() {
+	install_if="$pkgname-downstream-quirks=$pkgver-r$pkgrel openrc"
+	replaces="udev-init-scripts-openrc"
+	install="$subpkgname.post-install"
+	install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle
+	install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0
+}
+
 sha512sums="
-e787dd30a667fd886a46bb0b670bd2771a8fc78fddc39bb86405fdda6024bc1211b82f89664b7cfc622adf2968b9cd09b0eb3d2ed607148bf3549dd783e6f752  device-samsung-a6lte.post-install
-9c0f939c97582d9c03fb62386527569b7f08dd6c8350c8ac6cf9f70d6d5da61d5fc95997b413c4fdb671379ab35caedb631b9af33c7a1e8f3388b3fb56d9b435  device-samsung-a6lte-downstream-quirks.post-install
 95b46ef54f2b92edefcdc3742a1d36b7c52066daeeb5002f25b4de144d52e3cda8e3981c8b44d608dcfaf6ec5a89066d1e53e9c1eccbaf03c262b6c162efe532  deviceinfo
 3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  etc-conf.d-samsungipcd
 f9716fc70bf3508d2f9e83d908f1c13103403f01ebb784acec6cdf3e959e92b63c75e49b0120abe1ada5a50d768dcf30b8472630da1172fc826485e97024d85e  etc-init.d-hciattach-ttySAC0
diff --git a/device/testing/device-samsung-a6lte/device-samsung-a6lte-downstream-quirks.post-install b/device/testing/device-samsung-a6lte/device-samsung-a6lte-downstream-quirks-openrc.post-install
similarity index 100%
rename from device/testing/device-samsung-a6lte/device-samsung-a6lte-downstream-quirks.post-install
rename to device/testing/device-samsung-a6lte/device-samsung-a6lte-downstream-quirks-openrc.post-install