diff --git a/run_config/fvp-spm.linux b/run_config/fvp-spm.linux
index 1757515..330d060 100644
--- a/run_config/fvp-spm.linux
+++ b/run_config/fvp-spm.linux
@@ -22,13 +22,13 @@
 }
 
 post_fetch_tf_resource() {
-	model="base-aemv8a" \
+        local model="base-aemv8a"
+
+	model="$model" \
 	arch_version="8.4" \
 	initrd_bin="initrd.img" \
 	el3_payload_bin="manifest.dtb" \
 		gen_model_params
 
-	model="base-aemv8a" \
-	model_bin="FVP_Base_AEMv8A-AEMv8A" \
-	       gen_fvp_yaml
+	model="$model" gen_fvp_yaml
 }