diff --git a/run_config/fvp-spm b/run_config/fvp-spm
index b53774c..c84d5ea 100644
--- a/run_config/fvp-spm
+++ b/run_config/fvp-spm
@@ -16,11 +16,8 @@
 }
 
 post_fetch_tf_resource() {
-	model="base-aemv8a" \
-	arch_version="8.4" \
-		gen_model_params
+        local model="base-aemv8a"
 
-	model="base-aemv8a" \
-	model_bin="FVP_Base_AEMv8A-AEMv8A" \
-	       gen_fvp_yaml
+	model="$model" arch_version="8.4" gen_model_params
+	model="$model" gen_fvp_yaml
 }