diff --git a/dynamic-layers/meta-networking/mosquitto/mosquitto_%.bbappend b/dynamic-layers/meta-networking/mosquitto/mosquitto_%.bbappend
index c858892..85dffc1 100644
--- a/dynamic-layers/meta-networking/mosquitto/mosquitto_%.bbappend
+++ b/dynamic-layers/meta-networking/mosquitto/mosquitto_%.bbappend
@@ -8,6 +8,6 @@ SRC_URI:append = " \
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/mosquitto.initd
-    openrc_install_confd ${WORKDIR}/mosquitto.confd
+    openrc_install_initd ${UNPACKDIR}/mosquitto.initd
+    openrc_install_confd ${UNPACKDIR}/mosquitto.confd
 }
diff --git a/dynamic-layers/meta-networking/networkmanager/networkmanager_%.bbappend b/dynamic-layers/meta-networking/networkmanager/networkmanager_%.bbappend
index 3c1f1bc..ad285e4 100644
--- a/dynamic-layers/meta-networking/networkmanager/networkmanager_%.bbappend
+++ b/dynamic-layers/meta-networking/networkmanager/networkmanager_%.bbappend
@@ -9,5 +9,5 @@ LICENSE += "${@bb.utils.contains('DISTRO_FEATURES', 'openrc', '& GPL-2.0-only',
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/networkmanager.initd
+    openrc_install_initd ${UNPACKDIR}/networkmanager.initd
 }
diff --git a/dynamic-layers/meta-oe/modemmanager/modemmanager_%.bbappend b/dynamic-layers/meta-oe/modemmanager/modemmanager_%.bbappend
index 05239b8..cee1b67 100644
--- a/dynamic-layers/meta-oe/modemmanager/modemmanager_%.bbappend
+++ b/dynamic-layers/meta-oe/modemmanager/modemmanager_%.bbappend
@@ -8,6 +8,6 @@ SRC_URI:append = " \
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/modemmanager.initd
-    openrc_install_confd ${WORKDIR}/modemmanager.confd
+    openrc_install_initd ${UNPACKDIR}/modemmanager.initd
+    openrc_install_confd ${UNPACKDIR}/modemmanager.confd
 }
diff --git a/dynamic-layers/meta-virtualization/docker/docker-openrc.inc b/dynamic-layers/meta-virtualization/docker/docker-openrc.inc
index 2a114f3..b76bc2f 100644
--- a/dynamic-layers/meta-virtualization/docker/docker-openrc.inc
+++ b/dynamic-layers/meta-virtualization/docker/docker-openrc.inc
@@ -10,6 +10,6 @@ inherit openrc
 OPENRC_SERVICES = "docker"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/docker.initd
-    openrc_install_confd ${WORKDIR}/docker.confd
+    openrc_install_initd ${UNPACKDIR}/docker.initd
+    openrc_install_confd ${UNPACKDIR}/docker.confd
 }
diff --git a/dynamic-layers/meta-webserver/nginx/nginx_%.bbappend b/dynamic-layers/meta-webserver/nginx/nginx_%.bbappend
index ba76e4a..2933e5a 100644
--- a/dynamic-layers/meta-webserver/nginx/nginx_%.bbappend
+++ b/dynamic-layers/meta-webserver/nginx/nginx_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://nginx.initd file://nginx.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/nginx.initd
-    openrc_install_confd ${WORKDIR}/nginx.confd
+    openrc_install_initd ${UNPACKDIR}/nginx.initd
+    openrc_install_confd ${UNPACKDIR}/nginx.confd
 }
diff --git a/recipes-appends/oe-core/acpid_%.bbappend b/recipes-appends/oe-core/acpid_%.bbappend
index 5f45b87..5ef6f2f 100644
--- a/recipes-appends/oe-core/acpid_%.bbappend
+++ b/recipes-appends/oe-core/acpid_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://acpid.initd file://acpid.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/acpid.initd
-    openrc_install_confd ${WORKDIR}/acpid.confd
+    openrc_install_initd ${UNPACKDIR}/acpid.initd
+    openrc_install_confd ${UNPACKDIR}/acpid.confd
 }
diff --git a/recipes-appends/oe-core/alsa-state.bbappend b/recipes-appends/oe-core/alsa-state.bbappend
index 50c2398..16e9a82 100644
--- a/recipes-appends/oe-core/alsa-state.bbappend
+++ b/recipes-appends/oe-core/alsa-state.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://alsa-state.initd"
 inherit openrc
 
 do_install:append() {
-    sed -i "s,@LOCALSTATEDIR@,${localstatedir},g" ${WORKDIR}/alsa-state.initd
-    openrc_install_initd ${WORKDIR}/alsa-state.initd
+    sed -i "s,@LOCALSTATEDIR@,${localstatedir},g" ${UNPACKDIR}/alsa-state.initd
+    openrc_install_initd ${UNPACKDIR}/alsa-state.initd
 }
diff --git a/recipes-appends/oe-core/at_%.bbappend b/recipes-appends/oe-core/at_%.bbappend
index 3db06ab..442059d 100644
--- a/recipes-appends/oe-core/at_%.bbappend
+++ b/recipes-appends/oe-core/at_%.bbappend
@@ -7,6 +7,6 @@ inherit openrc
 OPENRC_SERVICES:${PN} = "atd"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/atd.initd
-    openrc_install_confd ${WORKDIR}/atd.confd
+    openrc_install_initd ${UNPACKDIR}/atd.initd
+    openrc_install_confd ${UNPACKDIR}/atd.confd
 }
diff --git a/recipes-appends/oe-core/bind_%.bbappend b/recipes-appends/oe-core/bind_%.bbappend
index 5b47291..0a587ab 100644
--- a/recipes-appends/oe-core/bind_%.bbappend
+++ b/recipes-appends/oe-core/bind_%.bbappend
@@ -7,6 +7,6 @@ inherit openrc
 OPENRC_SERVICES:${PN} = "named"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/named.initd
-    openrc_install_confd ${WORKDIR}/named.confd
+    openrc_install_initd ${UNPACKDIR}/named.initd
+    openrc_install_confd ${UNPACKDIR}/named.confd
 }
diff --git a/recipes-appends/oe-core/bluez5_%.bbappend b/recipes-appends/oe-core/bluez5_%.bbappend
index 3074655..ab3c100 100644
--- a/recipes-appends/oe-core/bluez5_%.bbappend
+++ b/recipes-appends/oe-core/bluez5_%.bbappend
@@ -7,6 +7,6 @@ inherit openrc
 OPENRC_SERVICES = "bluetooth"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/bluetooth.initd
-    openrc_install_confd ${WORKDIR}/bluetooth.confd
+    openrc_install_initd ${UNPACKDIR}/bluetooth.initd
+    openrc_install_confd ${UNPACKDIR}/bluetooth.confd
 }
diff --git a/recipes-appends/oe-core/bootchart2_%.bbappend b/recipes-appends/oe-core/bootchart2_%.bbappend
index 7c8e2e7..b6be47f 100644
--- a/recipes-appends/oe-core/bootchart2_%.bbappend
+++ b/recipes-appends/oe-core/bootchart2_%.bbappend
@@ -8,5 +8,5 @@ OPENRC_PACKAGES = "bootchartd-stop-initscript"
 OPENRC_SERVICES:bootchartd-stop-initscript = "bootchart2"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/bootchart2.initd
+    openrc_install_initd ${UNPACKDIR}/bootchart2.initd
 }
diff --git a/recipes-appends/oe-core/busybox_%.bbappend b/recipes-appends/oe-core/busybox_%.bbappend
index cddce88..4644df6 100644
--- a/recipes-appends/oe-core/busybox_%.bbappend
+++ b/recipes-appends/oe-core/busybox_%.bbappend
@@ -36,7 +36,7 @@ do_install:append() {
 
     local svc
     for svc in acpid cron klogd httpd inetd mdev ntpd syslogd udhcpd; do
-        openrc_install_initd ${WORKDIR}/busybox-${svc}.initd
-        openrc_install_confd ${WORKDIR}/busybox-${svc}.confd
+        openrc_install_initd ${UNPACKDIR}/busybox-${svc}.initd
+        openrc_install_confd ${UNPACKDIR}/busybox-${svc}.confd
     done
 }
diff --git a/recipes-appends/oe-core/connman_%.bbappend b/recipes-appends/oe-core/connman_%.bbappend
index ac6c8cb..59b1720 100644
--- a/recipes-appends/oe-core/connman_%.bbappend
+++ b/recipes-appends/oe-core/connman_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://connman.initd file://connman.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/connman.initd
-    openrc_install_confd ${WORKDIR}/connman.confd
+    openrc_install_initd ${UNPACKDIR}/connman.initd
+    openrc_install_confd ${UNPACKDIR}/connman.confd
 }
diff --git a/recipes-appends/oe-core/cronie_%.bbappend b/recipes-appends/oe-core/cronie_%.bbappend
index 84caf04..8d82108 100644
--- a/recipes-appends/oe-core/cronie_%.bbappend
+++ b/recipes-appends/oe-core/cronie_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://cronie.initd file://cronie.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/cronie.initd
-    openrc_install_confd ${WORKDIR}/cronie.confd
+    openrc_install_initd ${UNPACKDIR}/cronie.initd
+    openrc_install_confd ${UNPACKDIR}/cronie.confd
 }
diff --git a/recipes-appends/oe-core/dbus_%.bbappend b/recipes-appends/oe-core/dbus_%.bbappend
index 9818c1d..f851151 100644
--- a/recipes-appends/oe-core/dbus_%.bbappend
+++ b/recipes-appends/oe-core/dbus_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://dbus.initd file://dbus.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/dbus.initd
-    openrc_install_confd ${WORKDIR}/dbus.confd
+    openrc_install_initd ${UNPACKDIR}/dbus.initd
+    openrc_install_confd ${UNPACKDIR}/dbus.confd
 }
diff --git a/recipes-appends/oe-core/dhcpcd_%.bbappend b/recipes-appends/oe-core/dhcpcd_%.bbappend
index 3485b33..932e302 100644
--- a/recipes-appends/oe-core/dhcpcd_%.bbappend
+++ b/recipes-appends/oe-core/dhcpcd_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://dhcpcd.initd file://dhcpcd.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/dhcpcd.initd
-    openrc_install_confd ${WORKDIR}/dhcpcd.confd
+    openrc_install_initd ${UNPACKDIR}/dhcpcd.initd
+    openrc_install_confd ${UNPACKDIR}/dhcpcd.confd
 }
diff --git a/recipes-appends/oe-core/distcc_%.bbappend b/recipes-appends/oe-core/distcc_%.bbappend
index 13902ea..8a89fb3 100644
--- a/recipes-appends/oe-core/distcc_%.bbappend
+++ b/recipes-appends/oe-core/distcc_%.bbappend
@@ -8,6 +8,6 @@ OPENRC_PACKAGES = "${PN}-server"
 OPENRC_SERVICES:${PN}-server = "distcc"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/distcc.initd
-    openrc_install_confd ${WORKDIR}/distcc.confd
+    openrc_install_initd ${UNPACKDIR}/distcc.initd
+    openrc_install_confd ${UNPACKDIR}/distcc.confd
 }
diff --git a/recipes-appends/oe-core/dropbear_%.bbappend b/recipes-appends/oe-core/dropbear_%.bbappend
index d8277fb..22f8dc5 100644
--- a/recipes-appends/oe-core/dropbear_%.bbappend
+++ b/recipes-appends/oe-core/dropbear_%.bbappend
@@ -10,9 +10,9 @@ do_install:append() {
     fi
 
     install -d ${D}${OPENRC_INITDIR}
-    install -m 0755 ${WORKDIR}/dropbear.initd ${D}${OPENRC_INITDIR}/dropbear
+    install -m 0755 ${UNPACKDIR}/dropbear.initd ${D}${OPENRC_INITDIR}/dropbear
     sed -i 's,@SBINDIR@,${sbindir},' ${D}${OPENRC_INITDIR}/dropbear
 
     install -d ${D}${OPENRC_CONFDIR}
-    install -m 0644 ${WORKDIR}/dropbear.confd ${D}${OPENRC_CONFDIR}/dropbear
+    install -m 0644 ${UNPACKDIR}/dropbear.confd ${D}${OPENRC_CONFDIR}/dropbear
 }
diff --git a/recipes-appends/oe-core/kea_%.bbappend b/recipes-appends/oe-core/kea_%.bbappend
index 1460e4a..082b17f 100644
--- a/recipes-appends/oe-core/kea_%.bbappend
+++ b/recipes-appends/oe-core/kea_%.bbappend
@@ -14,10 +14,10 @@ inherit openrc
 OPENRC_SERVICES:${PN} = "kea-dhcp4 kea-dhcp6 kea-dhcp-ddns"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/kea-dhcp4.initd
-    openrc_install_confd ${WORKDIR}/kea-dhcp4.confd
-    openrc_install_initd ${WORKDIR}/kea-dhcp6.initd
-    openrc_install_confd ${WORKDIR}/kea-dhcp6.confd
-    openrc_install_initd ${WORKDIR}/kea-dhcp-ddns.initd
-    openrc_install_confd ${WORKDIR}/kea-dhcp-ddns.confd
+    openrc_install_initd ${UNPACKDIR}/kea-dhcp4.initd
+    openrc_install_confd ${UNPACKDIR}/kea-dhcp4.confd
+    openrc_install_initd ${UNPACKDIR}/kea-dhcp6.initd
+    openrc_install_confd ${UNPACKDIR}/kea-dhcp6.confd
+    openrc_install_initd ${UNPACKDIR}/kea-dhcp-ddns.initd
+    openrc_install_confd ${UNPACKDIR}/kea-dhcp-ddns.confd
 }
diff --git a/recipes-appends/oe-core/lighttpd_%.bbappend b/recipes-appends/oe-core/lighttpd_%.bbappend
index da77f32..feebe20 100644
--- a/recipes-appends/oe-core/lighttpd_%.bbappend
+++ b/recipes-appends/oe-core/lighttpd_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://lighttpd.initd file://lighttpd.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/lighttpd.initd
-    openrc_install_confd ${WORKDIR}/lighttpd.confd
+    openrc_install_initd ${UNPACKDIR}/lighttpd.initd
+    openrc_install_confd ${UNPACKDIR}/lighttpd.confd
 }
diff --git a/recipes-appends/oe-core/neard_%.bbappend b/recipes-appends/oe-core/neard_%.bbappend
index 8fc58e1..34577ba 100644
--- a/recipes-appends/oe-core/neard_%.bbappend
+++ b/recipes-appends/oe-core/neard_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://neard.initd file://neard.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/neard.initd
-    openrc_install_confd ${WORKDIR}/neard.confd
+    openrc_install_initd ${UNPACKDIR}/neard.initd
+    openrc_install_confd ${UNPACKDIR}/neard.confd
 }
diff --git a/recipes-appends/oe-core/nfs-utils_%.bbappend b/recipes-appends/oe-core/nfs-utils_%.bbappend
index cd3b55f..2511c0d 100644
--- a/recipes-appends/oe-core/nfs-utils_%.bbappend
+++ b/recipes-appends/oe-core/nfs-utils_%.bbappend
@@ -31,16 +31,16 @@ OPENRC_SERVICES:${PN} = "nfs rpc.svcgssd"
 OPENRC_SERVICES:${PN}-client = "nfsclient rpc.statd rpc.idmapd rpc.gssd rpc.pipefs"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/nfs.initd
-    openrc_install_confd ${WORKDIR}/nfs.confd
-    openrc_install_initd ${WORKDIR}/rpc.svcgssd.initd
-
-    openrc_install_initd ${WORKDIR}/nfsclient.initd
-    openrc_install_confd ${WORKDIR}/nfsclient.confd
-    openrc_install_initd ${WORKDIR}/rpc.statd.initd
-    openrc_install_initd ${WORKDIR}/rpc.idmapd.initd
-    openrc_install_initd ${WORKDIR}/rpc.gssd.initd
-    openrc_install_initd ${WORKDIR}/rpc.pipefs.initd
+    openrc_install_initd ${UNPACKDIR}/nfs.initd
+    openrc_install_confd ${UNPACKDIR}/nfs.confd
+    openrc_install_initd ${UNPACKDIR}/rpc.svcgssd.initd
+
+    openrc_install_initd ${UNPACKDIR}/nfsclient.initd
+    openrc_install_confd ${UNPACKDIR}/nfsclient.confd
+    openrc_install_initd ${UNPACKDIR}/rpc.statd.initd
+    openrc_install_initd ${UNPACKDIR}/rpc.idmapd.initd
+    openrc_install_initd ${UNPACKDIR}/rpc.gssd.initd
+    openrc_install_initd ${UNPACKDIR}/rpc.pipefs.initd
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'openrc', 'true', 'false', d)}; then
         sed -i "s,=/sbin/rpc.statd,=${sbindir}/rpc.statd," ${D}${OPENRC_INITDIR}/rpc.statd
diff --git a/recipes-appends/oe-core/ofono_%.bbappend b/recipes-appends/oe-core/ofono_%.bbappend
index 7108bc4..c59a095 100644
--- a/recipes-appends/oe-core/ofono_%.bbappend
+++ b/recipes-appends/oe-core/ofono_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://ofono.initd file://ofono.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/ofono.initd
-    openrc_install_confd ${WORKDIR}/ofono.confd
+    openrc_install_initd ${UNPACKDIR}/ofono.initd
+    openrc_install_confd ${UNPACKDIR}/ofono.confd
 }
diff --git a/recipes-appends/oe-core/openssh_%.bbappend b/recipes-appends/oe-core/openssh_%.bbappend
index 2755c81..925773d 100644
--- a/recipes-appends/oe-core/openssh_%.bbappend
+++ b/recipes-appends/oe-core/openssh_%.bbappend
@@ -8,6 +8,6 @@ OPENRC_PACKAGES = "openssh-sshd"
 OPENRC_SERVICES:openssh-sshd = "sshd"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/sshd.initd
-    openrc_install_confd ${WORKDIR}/sshd.confd
+    openrc_install_initd ${UNPACKDIR}/sshd.initd
+    openrc_install_confd ${UNPACKDIR}/sshd.confd
 }
diff --git a/recipes-appends/oe-core/psplash_%.bbappend b/recipes-appends/oe-core/psplash_%.bbappend
index 0193858..61aeb39 100644
--- a/recipes-appends/oe-core/psplash_%.bbappend
+++ b/recipes-appends/oe-core/psplash_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://psplash.initd file://psplash.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/psplash.initd
-    openrc_install_confd ${WORKDIR}/psplash.confd
+    openrc_install_initd ${UNPACKDIR}/psplash.initd
+    openrc_install_confd ${UNPACKDIR}/psplash.confd
 }
diff --git a/recipes-appends/oe-core/rng-tools_%.bbappend b/recipes-appends/oe-core/rng-tools_%.bbappend
index 056a7fb..ec9cb9b 100644
--- a/recipes-appends/oe-core/rng-tools_%.bbappend
+++ b/recipes-appends/oe-core/rng-tools_%.bbappend
@@ -7,6 +7,6 @@ inherit openrc
 OPENRC_SERVICES = "rngd"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/rngd.initd
-    openrc_install_confd ${WORKDIR}/rngd.confd
+    openrc_install_initd ${UNPACKDIR}/rngd.initd
+    openrc_install_confd ${UNPACKDIR}/rngd.confd
 }
diff --git a/recipes-appends/oe-core/rpcbind_%.bbappend b/recipes-appends/oe-core/rpcbind_%.bbappend
index 75ed937..9ce5c11 100644
--- a/recipes-appends/oe-core/rpcbind_%.bbappend
+++ b/recipes-appends/oe-core/rpcbind_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://rpcbind.initd file://rpcbind.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/rpcbind.initd
-    openrc_install_confd ${WORKDIR}/rpcbind.confd
+    openrc_install_initd ${UNPACKDIR}/rpcbind.initd
+    openrc_install_confd ${UNPACKDIR}/rpcbind.confd
 }
diff --git a/recipes-appends/oe-core/run-postinsts_%.bbappend b/recipes-appends/oe-core/run-postinsts_%.bbappend
index 9a59004..bc0ae5a 100644
--- a/recipes-appends/oe-core/run-postinsts_%.bbappend
+++ b/recipes-appends/oe-core/run-postinsts_%.bbappend
@@ -14,7 +14,7 @@ do_install:append() {
         -e 's,update-rc.d -f run-postinsts remove,rc-update del run-postinsts boot,' \
         ${D}${sbindir}/run-postinsts
 
-    openrc_install_initd ${WORKDIR}/run-postinsts.initd
+    openrc_install_initd ${UNPACKDIR}/run-postinsts.initd
     install -d ${D}${sysconfdir}/runlevels/boot
     ln -snf ${OPENRC_INITDIR}/run-postinsts ${D}${sysconfdir}/runlevels/boot
 }
diff --git a/recipes-appends/oe-core/seatd_%.bbappend b/recipes-appends/oe-core/seatd_%.bbappend
index ca3adf5..8c1be28 100644
--- a/recipes-appends/oe-core/seatd_%.bbappend
+++ b/recipes-appends/oe-core/seatd_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://seatd.initd file://seatd.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/seatd.initd
-    openrc_install_confd ${WORKDIR}/seatd.confd
+    openrc_install_initd ${UNPACKDIR}/seatd.initd
+    openrc_install_confd ${UNPACKDIR}/seatd.confd
 }
diff --git a/recipes-appends/oe-core/sysklogd_%.bbappend b/recipes-appends/oe-core/sysklogd_%.bbappend
index 66e65db..2152a98 100644
--- a/recipes-appends/oe-core/sysklogd_%.bbappend
+++ b/recipes-appends/oe-core/sysklogd_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://sysklogd.initd file://sysklogd.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/sysklogd.initd
-    openrc_install_confd ${WORKDIR}/sysklogd.confd
+    openrc_install_initd ${UNPACKDIR}/sysklogd.initd
+    openrc_install_confd ${UNPACKDIR}/sysklogd.confd
 }
diff --git a/recipes-appends/oe-core/tcf-agent_%.bbappend b/recipes-appends/oe-core/tcf-agent_%.bbappend
index 09938df..a918d11 100644
--- a/recipes-appends/oe-core/tcf-agent_%.bbappend
+++ b/recipes-appends/oe-core/tcf-agent_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://tcf-agent.initd file://tcf-agent.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/tcf-agent.initd
-    openrc_install_confd ${WORKDIR}/tcf-agent.confd
+    openrc_install_initd ${UNPACKDIR}/tcf-agent.initd
+    openrc_install_confd ${UNPACKDIR}/tcf-agent.confd
 }
diff --git a/recipes-appends/oe-core/watchdog_%.bbappend b/recipes-appends/oe-core/watchdog_%.bbappend
index af0bf70..6616488 100644
--- a/recipes-appends/oe-core/watchdog_%.bbappend
+++ b/recipes-appends/oe-core/watchdog_%.bbappend
@@ -8,8 +8,8 @@ OPENRC_PACKAGES = "${PN} ${PN}-keepalive"
 OPENRC_SERVICES:${PN}-keepalive = "wd_keepalive"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/watchdog.initd
-    openrc_install_confd ${WORKDIR}/watchdog.confd
-    openrc_install_initd ${WORKDIR}/wd_keepalive.initd
-    openrc_install_confd ${WORKDIR}/wd_keepalive.confd
+    openrc_install_initd ${UNPACKDIR}/watchdog.initd
+    openrc_install_confd ${UNPACKDIR}/watchdog.confd
+    openrc_install_initd ${UNPACKDIR}/wd_keepalive.initd
+    openrc_install_confd ${UNPACKDIR}/wd_keepalive.confd
 }
diff --git a/recipes-appends/oe-core/wpa-supplicant_%.bbappend b/recipes-appends/oe-core/wpa-supplicant_%.bbappend
index 7da1888..9e439ce 100644
--- a/recipes-appends/oe-core/wpa-supplicant_%.bbappend
+++ b/recipes-appends/oe-core/wpa-supplicant_%.bbappend
@@ -7,6 +7,6 @@ inherit openrc
 OPENRC_SERVICES = "wpa_supplicant"
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/wpa_supplicant.initd
-    openrc_install_confd ${WORKDIR}/wpa_supplicant.confd
+    openrc_install_initd ${UNPACKDIR}/wpa_supplicant.initd
+    openrc_install_confd ${UNPACKDIR}/wpa_supplicant.confd
 }
diff --git a/recipes-appends/oe-core/xinetd_%.bbappend b/recipes-appends/oe-core/xinetd_%.bbappend
index 2f4a739..7d1edc4 100644
--- a/recipes-appends/oe-core/xinetd_%.bbappend
+++ b/recipes-appends/oe-core/xinetd_%.bbappend
@@ -5,6 +5,6 @@ SRC_URI += "file://xinetd.initd file://xinetd.confd"
 inherit openrc
 
 do_install:append() {
-    openrc_install_initd ${WORKDIR}/xinetd.initd
-    openrc_install_confd ${WORKDIR}/xinetd.confd
+    openrc_install_initd ${UNPACKDIR}/xinetd.initd
+    openrc_install_confd ${UNPACKDIR}/xinetd.confd
 }
diff --git a/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb b/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb
index 5c58f43..a4bcb1f 100644
--- a/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb
+++ b/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb
@@ -3,7 +3,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "file://inittab.in"
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 RPROVIDES:${PN} = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'busybox', 'virtual-openrc-inittab', '', d)}"
 
 INHIBIT_DEFAULT_DEPS = "1"
@@ -18,7 +19,7 @@ sbindir="${@d.getVar(bb.utils.contains('PACKAGECONFIG', 'usrmerge', 'sbindir', '
 
 do_install() {
     install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/inittab.in ${D}${sysconfdir}/inittab
+    install -m 0644 ${UNPACKDIR}/inittab.in ${D}${sysconfdir}/inittab
 }
 
 python update_inittab() {
diff --git a/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb b/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb
index a7ff028..d8da010 100644
--- a/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb
+++ b/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb
@@ -3,7 +3,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 SRC_URI = "file://inittab.in"
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
 RPROVIDES:${PN} = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'virtual-openrc-inittab', '', d)}"
 
 INHIBIT_DEFAULT_DEPS = "1"
@@ -18,7 +19,7 @@ sbindir="${@d.getVar(bb.utils.contains('PACKAGECONFIG', 'usrmerge', 'sbindir', '
 
 do_install() {
     install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/inittab.in ${D}${sysconfdir}/inittab
+    install -m 0644 ${UNPACKDIR}/inittab.in ${D}${sysconfdir}/inittab
 }
 
 python update_inittab() {
diff --git a/recipes-init/openrc/openrc_0.53.1.bb b/recipes-init/openrc/openrc_0.53.1.bb
index 6edf318..250b42f 100644
--- a/recipes-init/openrc/openrc_0.53.1.bb
+++ b/recipes-init/openrc/openrc_0.53.1.bb
@@ -53,8 +53,8 @@ do_install:append() {
     rm ${D}${sysconfdir}/runlevels/*/keymaps
 
     for svc in getty volatiles; do
-        install -m 755 ${WORKDIR}/${svc}.initd ${D}${OPENRC_INITDIR}/${svc}
-        ! [ -f ${WORKDIR}/${svc}.confd ] || install -m 644 ${WORKDIR}/${svc}.confd ${D}${OPENRC_CONFDIR}/${svc}
+        install -m 755 ${UNPACKDIR}/${svc}.initd ${D}${OPENRC_INITDIR}/${svc}
+        ! [ -f ${UNPACKDIR}/${svc}.confd ] || install -m 644 ${UNPACKDIR}/${svc}.confd ${D}${OPENRC_CONFDIR}/${svc}
         sed -i "s|/sbin/openrc-run|${openrc_sbindir}/openrc-run|" ${D}${OPENRC_INITDIR}/${svc}
     done
     ln -snf ${OPENRC_INITDIR}/volatiles ${D}${sysconfdir}/runlevels/boot