diff --git a/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-debug b/group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1-debug
similarity index 100%
rename from group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1x4-debug
rename to group/tf-l2-boot-tests-cortex/fvp-dynamiq-aarch64-only:fvp-linux-dtb.dyn-fip.uboot-neoverse_n1-debug
diff --git a/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-neoverse_n1x4-debug b/group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-neoverse_n1-debug
similarity index 100%
rename from group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-neoverse_n1x4-debug
rename to group/tftf-l2-fvp-dynamiq/fvp-dynamiq-aarch64-only,fvp-default:fvp-dtb.dyn-tftf-fip.tftf-neoverse_n1-debug
diff --git a/run_config/fvp-neoverse_n1x4 b/run_config/fvp-neoverse_n1
similarity index 79%
rename from run_config/fvp-neoverse_n1x4
rename to run_config/fvp-neoverse_n1
index c5cc467..6ce45ef 100644
--- a/run_config/fvp-neoverse_n1x4
+++ b/run_config/fvp-neoverse_n1
@@ -8,10 +8,10 @@
 generate_lava_job() {
 	local model="neoverse_n1"
 
-	uart="0" set_expect_variable "num_cpus" "4"
+	uart="0" set_expect_variable "num_cpus" "1"
 
 	model="$model" \
-	cluster_0_num_cores="4" \
+	cluster_0_num_cores="1" \
 	use_pchannel_for_threads="1" \
 	gen_model_params
 
diff --git a/run_config/fvp-neoverse_n2x4 b/run_config/fvp-neoverse_n2x4
index 09817e0..f50f889 100644
--- a/run_config/fvp-neoverse_n2x4
+++ b/run_config/fvp-neoverse_n2x4
@@ -8,7 +8,7 @@
 generate_lava_job() {
 	local model="neoverse_n2"
 
-	uart="0" set_expect_variable "num_cpus" "4"
+	uart="0" set_expect_variable "num_cpus" "1"
 
 	model="$model" cache_state_modelled="0" gen_model_params
 	model="$model" gen_fvp_yaml