diff --git a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf
index 79b95a8a..b937286b 100644
--- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf
+++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf
@@ -17,7 +17,7 @@ KERNEL_DEVICETREE = "arm/fvp-baser-aemv8r64.dtb"
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
 IMAGE_FSTYPES += "wic"
-WKS_FILE ?= "${MACHINE}.wks"
+WKS_FILE ?= "fvp-base.wks"
 
 # As this is a virtual target that will not be used in the real world there is
 # no need for real SSH keys.  Disable rng-tools (which takes too long to
diff --git a/meta-arm-bsp/wic/fvp-baser-aemv8r64.wks b/meta-arm-bsp/wic/fvp-baser-aemv8r64.wks
deleted file mode 100644
index 47014068..00000000
--- a/meta-arm-bsp/wic/fvp-baser-aemv8r64.wks
+++ /dev/null
@@ -1,3 +0,0 @@
-# For fvp-baser-aemv8r64 machine we just need to populate the rootfs partition
-
-part / --source rootfs --ondisk sda --fstype=ext4 --label root --align 1024 --extra-space 100