diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD
index e7262da5a..7cb134cee 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=49
+pkgver=50
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -352,9 +352,9 @@ f3463b85ac47055b400dfd2e24694c5e1dc6ab039efac0fe54496fc027c0732cda5e52a362a497b3
 bc7987a001d2076788d904f1ea6d3e97a2ab905ee55302ffb90402133c2b9fb760d7ad94e06971d811b9d905048e164cb78355f8cd087219b5b8ff6dab2fbd9c  user-gnome-clocks.service
 ccf803ac6a764570a98845f0b0ddcde0529943472ce4cc3dc904501883a51fda482d7aef3b84fac89590e869fecdcec9142a6eac3db8ae73782a5e29f32eaae1  user-gnome-terminal-server.service
 e0c5baf8030bae74c1ddb0f6f9bc4fdf2a1febaa344de1957d9a69a01eb7e1dc143b9d324ef15214289934b3a7fd4725df26b032f9225102d9cf5633145320bc  user-goimapnotify@.service
-41476015b700642b4451c572012fc5ad248abe76ff16fd9bad35e7710b0073b76370c6ce23a183fb54fdaf1ac3be8888323fa04f6f15d3b9ce9eaadeccaa64ad  system-hexagonrpcd-adsp-rootpd.service
-03a948f31ca756af7bff4ebff1d1b447532586d290981e99802488962c530d58352a04ee59436436212a5ae3fb496e837f23b3f24c43016cd36af108569cb58a  system-hexagonrpcd-adsp-sensorspd.service
-c7eee76a471f0fd62fc78e645bcabbabb2f7a61117303fb582f502548f5849e931adf9ac11251bc765506960408c3a2f41b9eb1a5563582177b2c7517c671bfb  system-hexagonrpcd-sdsp.service
+b31259eabac94a0709c274f37f8c0ce1752964d19e63306a04bc72cc426be3c40b3743bbf7e955cfbf5871295ea00c70d9f0ecd94a9fb4b7a422439cb7d4bd2a  system-hexagonrpcd-adsp-rootpd.service
+13547507622ad1e9505ef243e972b2bfaaf13e4ebe93801df2899828033be6683768cddb16de83a09aec3c09edc8d21c0cc6b5e127ad6168f70627e0e35f0146  system-hexagonrpcd-adsp-sensorspd.service
+ac6b7ac72f8caad95e73191a3839b9d8b125c9dd315fb3dbb9c386c132972684ea65ac33fcfb2a6e26ec49079d939a05a4d8059dba19b29dd2da230ee6726378  system-hexagonrpcd-sdsp.service
 af0e416f78ab317fe09813de58b446e5178457992ea4a2da2eb128811045201087d847e1b7ac0447a59c20129a736135e5d76b113262aa1f76b994e77b9c6b42  system-iio-sensor-proxy.service.d-hexagonrpcd.conf
 5087ff36981b89c9bd09f96cff93d1f20d5af513e2cdebf65a85e329f458a9a2b77c12091ed31278c3b89baef79273cc818fddabbe4e1eec75faf7b9cc18cb8a  system-hfd-service.service
 d12ebe6e7db2a8e34baab640dd4e2ea9cd01bc19054adf32d55528a6b27f71c2006ac2d65a58c98e21ed598e9cc66bfe79e197d20ed9d13f866a5a6cd3e247d5  system-iio-sensor-proxy.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 ad8ea8301..7888fe354 100644
--- a/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-rootpd.service
+++ b/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-rootpd.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for RootPD
-ConditionPathExists=/etc/conf.d/hexagonrpcd-adsp-rootpd
+ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-adsp-rootpd.conf
 ConditionPathExists=/dev/fastrpc-adsp
 
 [Service]
-EnvironmentFile=/etc/conf.d/hexagonrpcd-adsp-rootpd
+EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-adsp-rootpd.conf
 ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -R ${hexagonrpcd_fw_dir}
 Restart=always
 RestartSec=3
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 60de97ea3..716d472d4 100644
--- a/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-sensorspd.service
+++ b/extra-repos/systemd/systemd-services/system-hexagonrpcd-adsp-sensorspd.service
@@ -2,13 +2,13 @@
 Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for SensorPD
 Conflicts=suspend.target
 Before=suspend.target
-ConditionPathExists=/etc/conf.d/hexagonrpcd-adsp-sensorspd
+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=/etc/conf.d/hexagonrpcd-adsp-sensorspd
+EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -s -R ${hexagonrpcd_fw_dir}
 Restart=always
 RestartSec=3
diff --git a/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service b/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service
index c60623794..ce92a030e 100644
--- a/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service
+++ b/extra-repos/systemd/systemd-services/system-hexagonrpcd-sdsp.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=Daemon to support Qualcomm Hexagon SDSP virtual filesystem
-ConditionPathExists=/etc/conf.d/hexagonrpcd-sdsp
+ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 ConditionPathExists=/dev/fastrpc-sdsp
 
 [Service]
-EnvironmentFile=/etc/conf.d/hexagonrpcd-sdsp
+EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-sdsp -d sdsp -s -R ${hexagonrpcd_fw_dir}
 Restart=always
 RestartSec=3