diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
index c168cdea..5a83102b 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
@@ -39,7 +39,7 @@ TFA_ARM_SPMC_MANIFEST_DTS ?= ""
 # Build for debug (set TFA_DEBUG to 1 to activate)
 TFA_DEBUG ?= "0"

-S = "${WORKDIR}/git"
+#S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

 # mbed TLS support (set TFA_MBEDTLS to 1 to activate)
diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
index 92f080bf..cbf51d6d 100644
--- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
+++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc
@@ -57,7 +57,7 @@ DEPENDS += "util-linux-native iasl-native"

 inherit deploy

-S = "${WORKDIR}/edk2"
+#S = "${WORKDIR}/edk2"
 B = "${WORKDIR}/build"

 LDFLAGS[unexport] = "1"
diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
index 6188b07e..04c6f679 100644
--- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
+++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon_7.8.0.bb
@@ -21,7 +21,7 @@ SRC_URI = "git://github.com/ARM-software/gator.git;protocol=http;branch=main;pro
            file://0001-Include-missing-cstdint.patch;striplevel=2 \
           "

-S = "${WORKDIR}/git/daemon"
+S = "${UNPACKDIR}/${PN}-${PV}/daemon"

 COMPATIBLE_HOST = "aarch64.*-linux"

diff --git a/meta-arm/recipes-devtools/opencsd/opencsd_1.5.6.bb b/meta-arm/recipes-devtools/opencsd/opencsd_1.5.6.bb
index 8deafd32..7b0cfded 100644
--- a/meta-arm/recipes-devtools/opencsd/opencsd_1.5.6.bb
+++ b/meta-arm/recipes-devtools/opencsd/opencsd_1.5.6.bb
@@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
 SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master"
 SRCREV = "1900c6fd110275305b956aa47bd9f0c76b13a134"

-S = "${WORKDIR}/git"
-
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"

 EXTRA_OEMAKE = "ARCH='${TARGET_ARCH}' \
diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc
index 7f515cb4..a89e3c1c 100644
--- a/meta-arm/recipes-security/optee/optee-os.inc
+++ b/meta-arm/recipes-security/optee/optee-os.inc
@@ -16,7 +16,7 @@ DEPENDS:append:toolchain-clang = " compiler-rt"

 SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https"

-S = "${WORKDIR}/git"
+#S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"

 EXTRA_OEMAKE += " \