diff --git a/dynamic-layers/virtualization-layer/recipes-extended/cloud-init/cloud-init_%.bbappend b/dynamic-layers/virtualization-layer/recipes-extended/cloud-init/cloud-init_%.bbappend
index de9811e6c5..940c44b908 100644
--- a/dynamic-layers/virtualization-layer/recipes-extended/cloud-init/cloud-init_%.bbappend
+++ b/dynamic-layers/virtualization-layer/recipes-extended/cloud-init/cloud-init_%.bbappend
@@ -5,7 +5,7 @@ SRC_URI:append:aws-ec2 = " file://cloud.cfg"
 # nooelint: oelint.func.specific
 do_install:append:aws-ec2 () {
     # Adding cloud-init configuration with reasonable settings.
-    install -T -m 0644 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg
+    install -T -m 0644 ${UNPACKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg
 }
 
 SYSTEMD_PACKAGES = "${PN}-systemd"
diff --git a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb
index dc5447e559..a865a37545 100644
--- a/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb
+++ b/recipes-sdk/amazon-kvs-producer-sdk/amazon-kvs-producer-pic_1.1.0.bb
@@ -65,7 +65,7 @@ RDEPENDS:${PN}-ptest += "\
 
 do_install_ptest () {
    install -d ${D}${PTEST_PATH}/tests
-   install -m 0755 ${WORKDIR}/ptest_result.py ${D}${PTEST_PATH}/
+   install -m 0755 ${UNPACKDIR}/ptest_result.py ${D}${PTEST_PATH}/
    cp -r ${B}/tst/kvspic_test ${D}${PTEST_PATH}/tests/
 }
 
diff --git a/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.10.2.bb b/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.10.2.bb
index 2dbbe0d233..26bfb3d1a7 100644
--- a/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.10.2.bb
+++ b/recipes-sdk/amazon-kvs-webrtc-sdk/amazon-kvs-webrtc-sdk_1.10.2.bb
@@ -84,7 +84,7 @@ EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=1"
 
 do_install_ptest () {
     cp -r ${B}/tst/webrtc_client_test ${D}${PTEST_PATH}/
-    install -m 0755 ${WORKDIR}/ptest_result.py ${D}${PTEST_PATH}/
+    install -m 0755 ${UNPACKDIR}/ptest_result.py ${D}${PTEST_PATH}/
 }
 
 # nooelint: oelint.vars.insaneskip:INSANE_SKIP
diff --git a/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.333.bb b/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.333.bb
index 66b058a838..94547ff369 100644
--- a/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.333.bb
+++ b/recipes-sdk/aws-sdk-cpp/aws-sdk-cpp_1.11.333.bb
@@ -79,7 +79,7 @@ RRECOMMENDS:${PN}:class-native = ""
 do_install_ptest () {
     install -d ${D}${PTEST_PATH}/tests
     find ${B}/generated/tests -executable -type f -exec install -m 0755 "{}" ${D}${PTEST_PATH}/tests/ \;
-    install -m 0755 ${WORKDIR}/ptest_result.py ${D}${PTEST_PATH}/
+    install -m 0755 ${UNPACKDIR}/ptest_result.py ${D}${PTEST_PATH}/
 }
 
 # this is related to this bug