diff --git a/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc b/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc
index 69ba1b4..fdbc1bd 100644
--- a/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc
+++ b/meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc
@@ -76,4 +76,4 @@ fakeroot python do_sign() {
 
 FILES:${PN} += "${EFI_BOOT_PATH}"
 
-SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/LockDown.efi"
+SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/LockDown.efi"
diff --git a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb
index 5c026df..07fa865 100644
--- a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb
+++ b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb
@@ -95,4 +95,4 @@ RDEPENDS:${PN} += "ovmf-pkcs7-efi"
 
 FILES:${PN} += "${EFI_TARGET}"
 
-SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/efi-unsigned"
+SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/efi-unsigned"
diff --git a/meta-integrity/conf/layer.conf b/meta-integrity/conf/layer.conf
index 64a950d..192b358 100644
--- a/meta-integrity/conf/layer.conf
+++ b/meta-integrity/conf/layer.conf
@@ -24,7 +24,7 @@ LAYERRECOMMENDS_integrity = "\
     tpm \
 "
 
-BB_HASHBASE_WHITELIST:append = " \
+BB_BASEHASH_IGNORE_VARS:append = " \
     RPM_FSK_PATH \
 "
 
diff --git a/meta-signing-key/conf/layer.conf b/meta-signing-key/conf/layer.conf
index 331fb19..fe551d8 100644
--- a/meta-signing-key/conf/layer.conf
+++ b/meta-signing-key/conf/layer.conf
@@ -64,7 +64,7 @@ RPM_GPG_PASSPHRASE ??= "SecureCore"
 BOOT_GPG_NAME ??= "SecureBootCore"
 BOOT_GPG_PASSPHRASE ??= "SecureCore"
 
-BB_HASHBASE_WHITELIST:append = " \
+BB_BASEHASH_IGNORE_VARS:append = " \
     SYSTEM_TRUSTED_KEYS_DIR \
     SECONDARY_TRUSTED_KEYS_DIR \
     MODSIGN_KEYS_DIR \