diff --git a/ci/fvp-base.yml b/ci/fvp-base.yml
index d71d33e4e449..bbc6c44db3be 100644
--- a/ci/fvp-base.yml
+++ b/ci/fvp-base.yml
@@ -7,3 +7,7 @@ header:
     - ci/fvp.yml
 
 machine: fvp-base
+
+target:
+  - core-image-sato
+  - boot-wrapper-aarch64
diff --git a/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend
new file mode 100644
index 000000000000..0e2812eab52d
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/boot-wrapper-aarch64/boot-wrapper-aarch64_%.bbappend
@@ -0,0 +1 @@
+COMPATIBLE_MACHINE:fvp-base = "fvp-base"