diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass
index 7494b8ba1bb..f0b3c6eedc4 100644
--- a/meta/classes-global/staging.bbclass
+++ b/meta/classes-global/staging.bbclass
@@ -247,6 +247,7 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d):
     staging_processfixme(fixme, targetdir, targetsysroot, nativesysroot, d)
     for p in sorted(postinsts):
         bb.note("Running postinst {}, output:\n{}".format(p, subprocess.check_output([p], stderr=subprocess.STDOUT)))
+staging_populate_sysroot_dir[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS BUILD_ARCH"
 
 #
 # Manifests here are complicated. The main sysroot area has the unpacked sstate
@@ -643,7 +644,7 @@ python extend_recipe_sysroot() {
 
     bb.utils.unlockfile(lock)
 }
-extend_recipe_sysroot[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA SSTATETASKS"
+extend_recipe_sysroot[vardepsexclude] += "BB_TASKDEPDATA SSTATETASKS"
 
 do_prepare_recipe_sysroot[deptask] = "do_populate_sysroot"
 python do_prepare_recipe_sysroot () {