diff --git a/mullvad-vpn-daemon/APKBUILD b/mullvad-vpn-daemon/APKBUILD
index ac611e2..ae6140b 100644
--- a/mullvad-vpn-daemon/APKBUILD
+++ b/mullvad-vpn-daemon/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=mullvad-vpn-daemon
 pkgver=2026.2_beta1
 pkgrel=1
-pkgdesc="Mullvad VPN system service"
+pkgdesc="Mullvad VPN client (daemon and CLI)"
 url="https://mullvad.net/"
 arch="all"
 license="GPL-3-or-later"
@@ -37,9 +37,9 @@ subpackages="
 	$pkgname-suid
 "
 source="
-	https://github.com/mullvad/mullvadvpn-app/archive/refs/tags/2026.2-beta1.tar.gz
+	https://github.com/mullvad/mullvadvpn-app/archive/refs/tags/${pkgver//_/-}.tar.gz
 "
-builddir="$srcdir/mullvadvpn-app-2026.2-beta1/"
+builddir="$srcdir/mullvadvpn-app-${pkgver//_/-}/"
 options="net suid"
 
 _cargo_target_dir="${CARGO_TARGET_DIR:-$builddir/target}"
@@ -98,10 +98,10 @@ systemd() {
 	pkgdesc="systemd service files for Mullvad VPN"
 	depends="$pkgname=$pkgver-r$pkgrel"
 
-	install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-daemon.service" \
+	install -m755 -D "$builddir/dist-assets/linux/mullvad-daemon.service" \
 		"$subpkgdir/usr/lib/systemd/system/mullvad-daemon.service"
 
-	install -m755 -D "$startdir/mullvadvpn-app/dist-assets/linux/mullvad-early-boot-blocking.service" \
+	install -m755 -D "$builddir/dist-assets/linux/mullvad-early-boot-blocking.service" \
 		"$subpkgdir/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
 }
 
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
index f9f78fd..980d1e5 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-install
@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
 # Are we running systemd?
-if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
+if which systemctl >/dev/null 2>&1 && systemctl is-system-running | grep -vq offline >/dev/null 2>&1; then
     # Does `mullvad-daemon.service` exist?
-    if systemctl list-unit-files mullvad-daemon.service &> /dev/null; then
+    if systemctl list-unit-files mullvad-daemon.service >/dev/null 2>&1; 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-systemd.post-upgrade b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
index f9f78fd..980d1e5 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.post-upgrade
@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
 # Are we running systemd?
-if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
+if which systemctl >/dev/null 2>&1 && systemctl is-system-running | grep -vq offline >/dev/null 2>&1; then
     # Does `mullvad-daemon.service` exist?
-    if systemctl list-unit-files mullvad-daemon.service &> /dev/null; then
+    if systemctl list-unit-files mullvad-daemon.service >/dev/null 2>&1; 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-deinstall b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-deinstall
index 08e399c..c3435a9 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-deinstall
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-deinstall
@@ -1,9 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
-rm -r --interactive=never /var/log/mullvad-vpn/ || \
+rm -r /var/log/mullvad-vpn/ || \
   echo "Failed to remove mullvad-vpn logs"
-rm -r --interactive=never /var/cache/mullvad-vpn/ || \
+rm -r /var/cache/mullvad-vpn/ || \
   echo "Failed to remove mullvad-vpn cache"
-rm -r --interactive=never /etc/mullvad-vpn || \
+rm -r /etc/mullvad-vpn || \
   echo "Failed to remove mullvad-vpn config"
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
index 9f0bee2..ec08ab4 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-install
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
 # Overwrite the cached relay list with the one embedded in the package.
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
index 1e32748..c7ddd4f 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
 # Overwrite the cached relay list with the one embedded in the package.
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-deinstall b/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-deinstall
index 62e78f0..a554b0e 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-deinstall
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-deinstall
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
 # the user might've disabled or stopped the service themselves already
diff --git a/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade b/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
index 25c56e7..9f88962 100644
--- a/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
+++ b/mullvad-vpn-daemon/mullvad-vpn-daemon.pre-upgrade
@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -eu
 
 # Are we running systemd?
-if which systemctl &> /dev/null && systemctl is-system-running | grep -vq offline &> /dev/null; then
+if which systemctl >/dev/null 2>&1 && systemctl is-system-running | grep -vq offline >/dev/null 2>&1; then
     # Is `mullvad-daemon.service` running?
-    if systemctl status mullvad-daemon &> /dev/null; then
+    if systemctl status mullvad-daemon >/dev/null 2>&1; then
         mullvad-setup prepare-restart || true
         systemctl stop mullvad-daemon.service
         systemctl disable mullvad-daemon.service