diff --git a/BoardConfig.mk b/BoardConfig.mk
index 490532d3be6ffa6a96f78442b5790d8241e40474..ae167a4d6e3a574a4cfd0e03bd1301036e99e81a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -165,14 +165,14 @@ SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
 
 # Verified Boot
 BOARD_AVB_ENABLE := true
-ifneq (,$(wildcard $(KEYS_DIR)/avb_murena_rsa4096.pem))
+ifneq (,$(wildcard user-keys/avb_murena_rsa4096.pem))
 BOARD_AVB_ALGORITHM := SHA256_RSA4096
-BOARD_AVB_KEY_PATH := $(KEYS_DIR)/avb_murena_rsa4096.pem
+BOARD_AVB_KEY_PATH := user-keys/avb_murena_rsa4096.pem
 endif
 BOARD_AVB_VBMETA_SYSTEM := system system_ext product
 BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA4096
-ifneq (,$(wildcard $(KEYS_DIR)/avb_murena_rsa4096.pem))
-BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(KEYS_DIR)/avb_murena_rsa4096.pem
+ifneq (,$(wildcard user-keys/avb_murena_rsa4096.pem))
+BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := user-keys/avb_murena_rsa4096.pem
 else
 BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
 endif