diff --git a/run_config/fvp-aemv8a.el3payload b/run_config/fvp-aemv8a.el3payload
index 9f2d68f..c353092 100644
--- a/run_config/fvp-aemv8a.el3payload
+++ b/run_config/fvp-aemv8a.el3payload
@@ -6,11 +6,11 @@
 #
 
 post_fetch_tf_resource() {
+        local model="base-aemv8a"
+
 	pctl_startup="0.0.*.0,0.1.*.0" \
 		secure_ram_fill="1" \
-		model="base-aemv8a" gen_model_params
+		model="$model" gen_model_params
 
-	model="base-aemv8a" \
-	model_bin="FVP_Base_AEMv8A-AEMv8A" \
-	       gen_fvp_yaml
+	model="$model" gen_fvp_yaml
 }