diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index f98714a48..fe4e08d33 100644
--- a/extra-repos/systemd/systemd-services/APKBUILD
+++ b/extra-repos/systemd/systemd-services/APKBUILD
@@ -7,7 +7,7 @@
 # How to add a new service file (5 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=95
+pkgver=96
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -455,9 +455,9 @@ bc7987a001d2076788d904f1ea6d3e97a2ab905ee55302ffb90402133c2b9fb760d7ad94e06971d8
 ccf803ac6a764570a98845f0b0ddcde0529943472ce4cc3dc904501883a51fda482d7aef3b84fac89590e869fecdcec9142a6eac3db8ae73782a5e29f32eaae1  user-gnome-terminal-server.service
 e0c5baf8030bae74c1ddb0f6f9bc4fdf2a1febaa344de1957d9a69a01eb7e1dc143b9d324ef15214289934b3a7fd4725df26b032f9225102d9cf5633145320bc  user-goimapnotify@.service
 e226bdb71f6fafe92d14046dfa19ddbccb765b579c1f90687a9ece376fa12406db9f2cf8035ff07d5a78ef77dc73615d39a8790f8722585bf65872be773888ff  system-wlgreet.service
-b31259eabac94a0709c274f37f8c0ce1752964d19e63306a04bc72cc426be3c40b3743bbf7e955cfbf5871295ea00c70d9f0ecd94a9fb4b7a422439cb7d4bd2a  system-hexagonrpcd-adsp-rootpd.service
-13547507622ad1e9505ef243e972b2bfaaf13e4ebe93801df2899828033be6683768cddb16de83a09aec3c09edc8d21c0cc6b5e127ad6168f70627e0e35f0146  system-hexagonrpcd-adsp-sensorspd.service
-ac6b7ac72f8caad95e73191a3839b9d8b125c9dd315fb3dbb9c386c132972684ea65ac33fcfb2a6e26ec49079d939a05a4d8059dba19b29dd2da230ee6726378  system-hexagonrpcd-sdsp.service
+558cca90f2a5a9472a906f26e02995d06e2a6d3121b452b9cd7ec8507ca973cad2bb4068ff52e5a74a47af405feb0466474ecbca1eb03ca6ca738cb7c45e1465  system-hexagonrpcd-adsp-rootpd.service
+146e30849b4e829213bd2b097dc0b5049b98ab4adb525bff4e06cac1800284aaa7a7dbca2fce113ba3bccaa94a58ff95c7230e8603b23335a5c39dd27cc9d61f  system-hexagonrpcd-adsp-sensorspd.service
+cf95791ba56247e3b37a1e23d59638ded09cf343b646dd68b733cc1f72d3ea3daa038a99ca961f44792dd5ba35bc1b56808eb9e87f6bbc5426fa24a12eae89d1  system-hexagonrpcd-sdsp.service
 2e8a876b61093add48e0677dcbfdac148690eddb398ff51ab4edb6547515ad8f8cfec31e8fda6886746b3bf30410b7b63c7486dcfe2441a7e742ea5023981a45  system-iio-sensor-proxy.service.d-hexagonrpcd.conf
 5087ff36981b89c9bd09f96cff93d1f20d5af513e2cdebf65a85e329f458a9a2b77c12091ed31278c3b89baef79273cc818fddabbe4e1eec75faf7b9cc18cb8a  system-hfd-service.service
 083e59dcbbbd8f6ea148880256ff20f1a16e583348cd7cfc7aa6321d7b0cbe0a82780fd482a26ef25a5ebcfc83f5b7899d5db7c7d479fd7c56e5d7e95fd24a34  system-hkdm.service
diff --git a/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-rootpd.service b/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-rootpd.service
index 7888fe354..8399c2122 100644
--- a/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-rootpd.service
+++ b/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-rootpd.service
@@ -1,11 +1,9 @@
 [Unit]
 Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for RootPD
-ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-adsp-rootpd.conf
 ConditionPathExists=/dev/fastrpc-adsp
 
 [Service]
-EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-adsp-rootpd.conf
-ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -R ${hexagonrpcd_fw_dir}
+ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp
 Restart=always
 RestartSec=3
 User=fastrpc
diff --git a/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-sensorspd.service b/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-sensorspd.service
index 716d472d4..2315f8382 100644
--- a/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-sensorspd.service
+++ b/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-sensorspd.service
@@ -2,14 +2,12 @@
 Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for SensorPD
 Conflicts=suspend.target
 Before=suspend.target
-ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 # This service shouldn't be run on devices with an SDSP
 ConditionPathExists=!/dev/fastrpc-sdsp
 ConditionPathExists=/dev/fastrpc-adsp
 
 [Service]
-EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
-ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -s -R ${hexagonrpcd_fw_dir}
+ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -s
 Restart=always
 RestartSec=3
 User=fastrpc
diff --git a/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service b/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service
index ce92a030e..0d275920f 100644
--- a/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service
+++ b/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service
@@ -1,11 +1,9 @@
 [Unit]
 Description=Daemon to support Qualcomm Hexagon SDSP virtual filesystem
-ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 ConditionPathExists=/dev/fastrpc-sdsp
 
 [Service]
-EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
-ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-sdsp -d sdsp -s -R ${hexagonrpcd_fw_dir}
+ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-sdsp -d sdsp -s
 Restart=always
 RestartSec=3
 User=fastrpc