diff --git a/main/postmarketos-bootsplash/APKBUILD b/main/postmarketos-bootsplash/APKBUILD
index d9cb7891a..9f12cd2b4 100644
--- a/main/postmarketos-bootsplash/APKBUILD
+++ b/main/postmarketos-bootsplash/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Casey Connolly <kcxt@postmarketos.org>
 pkgname=postmarketos-bootsplash
-pkgver=0.2.3
-pkgrel=3
+pkgver=0.3.0
+pkgrel=0
 pkgdesc="pmOS integration components for pbsplash"
 url="https://postmarketos.org"
 arch="all"
@@ -41,29 +41,26 @@ openrc() {
 systemd() {
 	install_if="$pkgname=$pkgver-r$pkgrel systemd"
 
-	install -Dm644 "$srcdir/kill-pbsplash.service" -t \
-		"$subpkgdir"/usr/lib/systemd/system/
-	mkdir -p "$subpkgdir"/usr/lib/systemd/system/multi-user.target.wants
-	ln -s ../kill-pbsplash.service \
-		"$subpkgdir"/usr/lib/systemd/system/multi-user.target.wants/
-	install -Dm644 "$srcdir/kill-pbsplash-override.conf" -t \
-		"$subpkgdir"/usr/lib/systemd/system/display-manager.service.d/
+	for _service in display-manager emergency rescue shutdown-splash; do
+		install -Dm644 "$srcdir/kill-pbsplash-override.conf" -t \
+			"$subpkgdir"/usr/lib/systemd/system/"$_service".service.d/
+	done
 
 	install -Dm644 "$srcdir/shutdown-splash.service" \
 		-t "$subpkgdir"/usr/lib/systemd/system/
-	# Install into related targets
 	for target in halt reboot shutdown; do
 		mkdir -p "$subpkgdir"/usr/lib/systemd/system/"$target".target.wants
 		ln -s ../shutdown-splash.service \
 			"$subpkgdir"/usr/lib/systemd/system/"$target".target.wants/
 	done
+
 }
 
 sha512sums="
 aa3489ae15a36f3dd247d6850c72c8431365058e248948bac6c89bb0b77de7eca3b99112eec5fde2e7ca55b8a03a74fa224055696e798f3ae5a0aefc92456334  kill-pbsplash
-79dd5eacf5914fb5eb1ef1b820478c07d2e0ae49441c9dc32c2ec18f26303f0e97c85221bab8e79abb854949e1ac4c20c566bb16379d4d396bda10d3d3b3d4d1  kill-pbsplash.service
+8be71d7901bae213408bdc60e1c8429502fd0082fc60ec5080ac3968e652986e9869223d5297363f0f5bbdd5dae848c9ddd56c412fc4017478d00b72af423cf6  kill-pbsplash.service
 476c7a8106429c35e772eaf98e257f7a77070050431875113c7c0c75a358250757a381086c7302f1eded0d4cde88d2e63f9fa5d69b6fce46e2d908afd8d9323a  shutdown-splash.service
-c413607e21c805fff3d9948963aebf1048cdb2e68ed2f4316723d21f861a32aede7d1bf3851c8ba7562b07302471ca6d8f7be1e0487d83dd4cdea9bbb506e792  kill-pbsplash-override.conf
+feae8a800ab0995f43dd4d519ca94497f89edaa79f1b11501be68579adf3a60b5a97b43bcffd873f9ab83b4d01e87384c54304ef66549b2de8b01c09227d308d  kill-pbsplash-override.conf
 ad54176548c67bb1cb1208588847d0269c388b61fc3a96ec775b747c3d90d3402a016e50146858c70552f3f4159cfba2d88598edd930e1127cf79b2eb9bdcfff  99-shutdown-pbsplash.stop
 2387c64d84f0ba3ee76925f55c87ce025140aa3cd462107a851c34ffd89bd52f606e0d1f9f371d4f642d96545d5cc1bc0fcfb23ca7629a9149055f068da6bffd  OpenSans-Regular.svg
 98984fd67b99400d2b08422c4d314da558d3c94ee67dbc895e7bbfd6fdf22d4b2c9d35f48f4b73b383a054f535d4089fb705c5532f034cb2ee54eab2184e8e86  pmos-logo.svg
diff --git a/main/postmarketos-bootsplash/kill-pbsplash-override.conf b/main/postmarketos-bootsplash/kill-pbsplash-override.conf
index 84df165c9..12b297558 100644
--- a/main/postmarketos-bootsplash/kill-pbsplash-override.conf
+++ b/main/postmarketos-bootsplash/kill-pbsplash-override.conf
@@ -1,3 +1,2 @@
-[Unit]
-# Trigger killing pbsplash when the display manager starts
-OnFailure=kill-pbsplash.service
+[Service]
+ExecStartPre=-killall pbsplash
diff --git a/main/postmarketos-bootsplash/kill-pbsplash.service b/main/postmarketos-bootsplash/kill-pbsplash.service
index 6d5686ff5..90557d82f 100644
--- a/main/postmarketos-bootsplash/kill-pbsplash.service
+++ b/main/postmarketos-bootsplash/kill-pbsplash.service
@@ -1,11 +1,13 @@
 [Unit]
 Description=Stop pbsplash
-Requisite=graphical.target
+Before=display-manager.service emergency.service rescue.service shutdown-splash.service
 
 [Service]
+RemainAfterExit=yes
+# Prevent systemd from sending final TERM/KILL signals on shutdown/reboot
+SurviveFinalKillSignal=yes
 ExecStart=-/usr/bin/killall pbsplash
 Type=oneshot
-RemainAfterExit=yes
 
 [Install]
-WantedBy=graphical.target
+WantedBy=graphical.target emergency.target rescue.target halt.target shutdown.target reboot.target