diff --git a/mullvad-vpn-daemon/APKBUILD b/mullvad-vpn-daemon/APKBUILD
index ab18502..4116801 100644
--- a/mullvad-vpn-daemon/APKBUILD
+++ b/mullvad-vpn-daemon/APKBUILD
@@ -24,7 +24,7 @@ makedepends="
 	libnftnl-dev
 "
 checkdepends=""
-install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade $pkgname.pre-deinstall $pkgname.post-deinstall"
+install="$pkgname-systemd.post-install $pkgname.pre-upgrade $pkgname-systemd.post-upgrade $pkgname.pre-deinstall $pkgname.post-deinstall"
 subpackages="$pkgname-systemd"
 source=""
 builddir="$srcdir/"
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
similarity index 68%
rename from mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
rename to mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
index 55c766f..cce2bfd 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 set -eu
 
-echo "mullvad post-install"
+echo "mullvad-systemd post-install"
+# Are we running systemd?
 if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
-    if systemctl status mullvad-daemon &> /dev/null; then
+    # Does `mullvad-daemon.service` exist?
+    if systemctl list-unit-files mullvad-daemon.service &> /dev/null; then
       systemctl enable "/usr/lib/systemd/system/mullvad-daemon.service"
       systemctl start mullvad-daemon.service || echo "Failed to start mullvad-daemon.service"
       systemctl enable "/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
similarity index 68%
rename from mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
rename to mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
index 03919aa..0979ba0 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 set -eu
 
-echo "mullvad post-upgrade"
+echo "mullvad-systemd post-upgrade"
+# Are we running systemd?
 if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
-    if systemctl status mullvad-daemon &> /dev/null; then
+    # Does `mullvad-daemon.service` exist?
+    if systemctl list-unit-files mullvad-daemon.service &> /dev/null; then
       systemctl enable "/usr/lib/systemd/system/mullvad-daemon.service"
       systemctl start mullvad-daemon.service || echo "Failed to start mullvad-daemon.service"
       systemctl enable "/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade b/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
index f7be870..d79c5c5 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
@@ -2,7 +2,9 @@
 set -eu
 
 echo "mullvad pre-upgrade"
+# Are we running systemd?
 if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
+    # Is `mullvad-daemon.service` running?
     if systemctl status mullvad-daemon &> /dev/null; then
         mullvad-setup prepare-restart || true
         systemctl stop mullvad-daemon.service