diff --git a/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva-debug b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemva-debug
similarity index 100%
rename from group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva-debug
rename to group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemva-debug
diff --git a/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva.8_6-debug b/group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemva.8_6-debug
similarity index 100%
rename from group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb-fip.uboot-aemva.8_6-debug
rename to group/qa-fvp-pre-release/fvp-default:fvp-linux-dtb.1t-fip.uboot-aemva.8_6-debug
diff --git a/run_config/fvp-aemva b/run_config/fvp-aemva
index 9af9638..d7ec2ff 100644
--- a/run_config/fvp-aemva
+++ b/run_config/fvp-aemva
@@ -8,7 +8,7 @@
 generate_lava_job() {
 	local model="base-aemva"
 
-	uart="0" set_expect_variable "num_cpus" "4"
+	uart="0" set_expect_variable "num_cpus" "8"
 
 	model="$model" gen_model_params
 	model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-aemva.8_6 b/run_config/fvp-aemva.8_6
index 8392b39..2c1977d 100644
--- a/run_config/fvp-aemva.8_6
+++ b/run_config/fvp-aemva.8_6
@@ -8,7 +8,7 @@
 generate_lava_job() {
 	local model="base-aemva"
 
-	uart="0" set_expect_variable "num_cpus" "4"
+	uart="0" set_expect_variable "num_cpus" "8"
 
 	model="$model" arch_version="8.6" gen_model_params
 	model="$model" gen_fvp_yaml