diff --git a/recipes-support/fastrpc/fastrpc/adsprpcd.service b/recipes-support/fastrpc/fastrpc/adsprpcd.service
deleted file mode 100644
index e6084c13b..000000000
--- a/recipes-support/fastrpc/fastrpc/adsprpcd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=aDSP RPC daemon
-
-[Service]
-Type=exec
-ExecStart=/bin/sh -c 'source /usr/sbin/guess-dsp.sh && /usr/bin/adsprpcd'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-support/fastrpc/fastrpc/cdsprpcd.service b/recipes-support/fastrpc/fastrpc/cdsprpcd.service
deleted file mode 100644
index afd310581..000000000
--- a/recipes-support/fastrpc/fastrpc/cdsprpcd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=cDSP RPC daemon
-
-[Service]
-Type=exec
-ExecStart=/bin/sh -c 'source /usr/sbin/guess-dsp.sh && /usr/bin/cdsprpcd'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-support/fastrpc/fastrpc/guess-dsp.sh b/recipes-support/fastrpc/fastrpc/guess-dsp.sh
deleted file mode 100644
index c63158dba..000000000
--- a/recipes-support/fastrpc/fastrpc/guess-dsp.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2021-2024 Linaro
-#
-# SPDX-License-Identifier: MIT
-#
-
-set -e
-
-modprobe socinfo || true
-
-if [ -r /sys/firmware/devicetree/base/model ] ; then
-	MACHINE=`cat /sys/firmware/devicetree/base/model`
-	case "$MACHINE" in
-		*DB820c*)
-			DSP_LIBRARY_PATH=/usr/share/qcom/apq8096/Qualcomm/db820c/dsp
-			;;
-		*"Dragonboard 845c"*)
-			DSP_LIBRARY_PATH=/usr/share/qcom/sdm845/Thundercomm/db845c/dsp
-			;;
-		*"Robotics RB1"*)
-			DSP_LIBRARY_PATH=/usr/share/qcom/qcm2290/Thundercomm/RB1/dsp
-			;;
-		*"QRB4210 RB2"*)
-			DSP_LIBRARY_PATH=/usr/share/qcom/qrb4210/Thundercomm/RB2/dsp
-			;;
-		*"Robotics RB5"*)
-			DSP_LIBRARY_PATH=/usr/share/qcom/sm8250/Thundercomm/RB5/dsp
-			;;
-	esac
-fi
-
-if [ -z "$DSP_LIBRARY_PATH" -o ! -d "$DSP_LIBRARY_PATH" ] ; then
-	if [ -n "`ls /usr/share/qcom`" ] ; then
-		echo "DSP directory present, but didn't detect support for this platform, bailing out" 1>&2
-		exit 1
-	fi
-
-	echo "DSP directory not present, trying DSP partitions"
-
-	if [ -h /dev/disk/by-partlabel/dsp_a ] ; then
-		mount /dev/disk/by-partlabel/dsp_a /usr/share/qcom -o bind
-	else
-		mount /dev/disk/by-partlabel/dsp /usr/share/qcom -o bind
-	fi
-	DSP_LIBRARY_PATH=/usr/share/qcom
-fi
-
-export DSP_LIBRARY_PATH
-
-# compatibility
-ADSP_LIBRARY_PATH=$DSP_LIBRARY_PATH
-export ADSP_LIBRARY_PATH
diff --git a/recipes-support/fastrpc/fastrpc/sdsprpcd.service b/recipes-support/fastrpc/fastrpc/sdsprpcd.service
deleted file mode 100644
index 429694217..000000000
--- a/recipes-support/fastrpc/fastrpc/sdsprpcd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=sDSP RPC daemon
-
-[Service]
-Type=exec
-ExecStart=/bin/sh -c 'source /usr/sbin/guess-dsp.sh && /usr/bin/sdsprpcd'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-support/fastrpc/fastrpc_1.0.2.bb b/recipes-support/fastrpc/fastrpc_1.0.3.bb
similarity index 63%
rename from recipes-support/fastrpc/fastrpc_1.0.2.bb
rename to recipes-support/fastrpc/fastrpc_1.0.3.bb
index 76c921cbf..99530596f 100644
--- a/recipes-support/fastrpc/fastrpc_1.0.2.bb
+++ b/recipes-support/fastrpc/fastrpc_1.0.3.bb
@@ -4,40 +4,33 @@ SECTION = "devel"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b67986b6880754696d418dbaa2cf51d1"
-DEPENDS = "libyaml"
+DEPENDS = "libbsd libyaml"
 
-SRCREV = "cff7d44c4f1a2a9657514eecc0348caa3f455de4"
+SRCREV = "3ac74f68dfcc5aa3a9524d1700a4c0d6a92316a8"
 SRC_URI = "\
     git://github.com/qualcomm/fastrpc.git;branch=main;protocol=https;tag=v${PV} \
-    file://adsprpcd.service \
-    file://cdsprpcd.service \
-    file://sdsprpcd.service \
-    file://guess-dsp.sh \
     file://run-ptest \
 "
 
 inherit autotools systemd ptest pkgconfig
 
-PACKAGES += "${PN}-systemd"
-RRECOMMENDS:${PN} += "${PN}-systemd"
+EXTRA_OECONF += "--with-systemdsystemunitdir=${systemd_system_unitdir}"
 
-SYSTEMD_PACKAGES = "${PN} ${PN}-systemd"
-
-SYSTEMD_SERVICE:${PN}-systemd = "adsprpcd.service cdsprpcd.service sdsprpcd.service"
-SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable"
+SYSTEMD_SERVICE:${PN} = " \
+    adsprpcd.service \
+    adsprpcd_audiopd.service \
+    cdsprpcd.service \
+    cdsp1rpcd.service \
+    gdsp0rpcd.service \
+    gdsp1rpcd.service \
+    sdsprpcd.service \
+"
 
 do_install:append() {
-    install -d ${D}${libdir}/rfsa
-
-    install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${UNPACKDIR}/adsprpcd.service ${D}${systemd_unitdir}/system
-    install -m 0644 ${UNPACKDIR}/cdsprpcd.service ${D}${systemd_unitdir}/system
-    install -m 0644 ${UNPACKDIR}/sdsprpcd.service ${D}${systemd_unitdir}/system
-
-    install -d ${D}${sbindir}
-    install -m 0755 ${UNPACKDIR}/guess-dsp.sh ${D}${sbindir}
-
     install -d ${D}${datadir}/qcom/
+
+    sed -i -e 's:/usr/bin/:${bindir}/:g' \
+        ${D}${systemd_system_unitdir}/*.service
 }
 
 FILES:${PN} += " \