diff --git a/meta-arm-autonomy/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/xen_u-boot_kernel_addr.patch b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/xen_u-boot_kernel_addr.patch
similarity index 100%
rename from meta-arm-autonomy/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/xen_u-boot_kernel_addr.patch
rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/xen_u-boot_kernel_addr.patch
diff --git a/meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
similarity index 79%
rename from meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend
rename to meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index daabc5f1..e1ba91f0 100644
--- a/meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,6 +1,6 @@
 # Machine specific u-boot
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 #
 # FVP BASE