diff --git a/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb b/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb
index cc544b3..da8d2c3 100644
--- a/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb
+++ b/dynamic-layers/qt5/recipes-updatehub/updatehub-sdk-qt/updatehub-sdk-qt_git.bb
@@ -7,8 +7,6 @@ PV = "2.0.0"
 SRCREV = "04ef75ddbc3e35e41f56ca09a8622e237bc66d44"
 SRC_URI = "git://github.com/updatehub/agent-sdk-qt.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 inherit qmake5
 
 PACKAGECONFIG ??= "qmlplugin"
diff --git a/recipes-bsp/grub/updatehub-grub-script.bb b/recipes-bsp/grub/updatehub-grub-script.bb
index 9c56ad3..31c2b81 100644
--- a/recipes-bsp/grub/updatehub-grub-script.bb
+++ b/recipes-bsp/grub/updatehub-grub-script.bb
@@ -5,8 +5,7 @@ SRC_URI = "file://grub.cfg"
 
 inherit deploy
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_deploy () {
     install -Dm644 ${UNPACKDIR}/grub.cfg ${DEPLOYDIR}/grub.cfg-${MACHINE}-${PV}-${PR}
diff --git a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb
index 38e7fdd..2e90897 100644
--- a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb
+++ b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-efi.bb
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://updatehub-grubenv.default"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb
index 6b5e9b7..ba5db92 100644
--- a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb
+++ b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub-tools_git.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2"
 SRC_URI = "git://github.com/updatehub/active-inactive-backend-grub.git;protocol=https;branch=master"
 SRCREV = "e9ef6369857ab48ae245a224874de3bad7bd29ed"
 
-S = "${WORKDIR}/git"
-
 PV = "0.0+${SRCPV}"
 
 inherit allarch
diff --git a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb
index 04a4a59..c0b5781 100644
--- a/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb
+++ b/recipes-bsp/updatehub-active-inactive-backend/updatehub-active-inactive-backend-grub.bb
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 
 SRC_URI = "file://updatehub-grubenv.default"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
diff --git a/recipes-core/updatehub/updatehub-device-attributes_git.bb b/recipes-core/updatehub/updatehub-device-attributes_git.bb
index 8cb21de..9c54814 100644
--- a/recipes-core/updatehub/updatehub-device-attributes_git.bb
+++ b/recipes-core/updatehub/updatehub-device-attributes_git.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=838c366f69b72c5df05c96dff79b35f2"
 SRC_URI = "git://github.com/updatehub/device-attributes;protocol=https;branch=master"
 SRCREV = "c7ee915b0d304cec33a08cea7d3f184150c88dd1"
 
-S = "${WORKDIR}/git"
-
 inherit allarch
 
 do_configure[noexec] = "1"