diff --git a/fvp_utils.sh b/fvp_utils.sh
index 5f12d3d..71e71eb 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -56,7 +56,7 @@
 
 # FVP containers and model paths
 fvp_arm_std_library="fvp:fvp_arm_std_library_${model_version}_${model_build};/opt/model/FVP_ARM_Std_Library/FVP_Base"
-fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build};/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
+fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build}_linux64;/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
 fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
 fvp_rd_1_ae="fvp:fvp_rd_1_ae_${model_version}_${model_build};/opt/model/FVP_RD_1_AE/models/${model_flavour}"
 
@@ -300,12 +300,10 @@
         [coverage_trace_plugin]="coverage_trace.so"
         [dtb]="dtb.bin"
         [el3_payload]="el3_payload.bin"
-        [etm_trace]="ETMv4ExamplePlugin.so"
         [fip_gpt]="fip_gpt.bin"
         [fip]="fip.bin"
         [fvp_spmc_manifest_dtb]="=fvp_spmc_manifest.dtb"
         [fwu_fip]="fwu_fip.bin"
-        [generic_trace]="GenericTrace.so"
         [hafnium]="hafnium.bin"
         [image]="kernel.bin"
         [ivy]="ivy.pkg"
@@ -352,12 +350,10 @@
         [coverage_trace_plugin]="$(gen_cc_url)"
         [dtb]="$(gen_bin_url ${model_dtb})"
         [el3_payload]="$(gen_bin_url el3_payload.bin)"
-        [etm_trace]="${tfa_downloads}/FastModelsPortfolio_${model_version}/plugins/${model_flavour}/ETMv4ExamplePlugin.so"
         [fip]="$(gen_bin_url fip.bin)"
         [fip_gpt]="$(gen_bin_url fip_gpt.bin)"
         [fvp_spmc_manifest_dtb]="$(gen_bin_url fvp_spmc_manifest.dtb)"
         [fwu_fip]="$(gen_bin_url fwu_fip.bin)"
-        [generic_trace]="${tfa_downloads}/FastModelsPortfolio_${model_version}/plugins/${model_flavour}/GenericTrace.so"
         [hafnium]="$(gen_bin_url hafnium.bin)"
         [image]="$(gen_bin_url kernel.bin)"
         [ivy]="$(gen_bin_url ivy.pkg)"
@@ -409,11 +405,9 @@
         ["[= ]busybox.bin"]="={BUSYBOX}"
         ["[= ]dtb.bin"]="={DTB}"
         ["[= ]el3_payload.bin"]="={EL3_PAYLOAD}"
-        ["[= ].*ETMv4ExamplePlugin.so"]="={ETM_TRACE}"
         ["[= ]fip_gpt.bin"]="={FIP_GPT}"
         ["[= ]fwu_fip.bin"]="={FWU_FIP}"
         ["[= ]fip.bin"]="={FIP}"
-        ["[= ].*GenericTrace.so"]="={GENERIC_TRACE}"
         ["[= ].*/hafnium.bin"]="={HAFNIUM}"
         ["[= ]kernel.bin"]="={IMAGE}"
         ["[= ]ivy.pkg"]="={IVY}"
diff --git a/model/base-aemv8a.sh b/model/base-aemv8a.sh
index 61a5533..0158f95 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -10,6 +10,7 @@
 	set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
 
 	default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
+        default_var generictrace_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/GenericTrace.so"
 
 	default_var bmcov_plugin_path "$workspace/artefacts/${bin_mode:?}/coverage_trace.so"
 else
@@ -21,8 +22,8 @@
 	models_dir="$(echo ${fvp_models[$model]} | awk -F ';' '{print $2}')"
         set_model_path "$models_dir"
 
-        # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
-	default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
+        default_var etm_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/ETMv4ExamplePlugin.so"
+        default_var generictrace_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/GenericTrace.so"
 fi
 
 default_var is_dual_cluster 1
diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 67f11e3..febe889 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -304,7 +304,7 @@
 -C pci.tbu0_pre_smmu_logger.trace_debug=1
 -C pci.pci_smmuv3.mmu.all_error_messages_through_trace=1
 -C TRACE.GenericTrace.trace-sources=verbose_commentary,smmu_initial_transaction,smmu_final_transaction,*.pci.pci_smmuv3.mmu.*,*.pci.smmulogger.*,*.pci.tbu0_pre_smmu_logger.*,smmu_poison_tw_data
---plugin $warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/GenericTrace.so
+--plugin $generictrace_plugin_path
 -C cci550.force_on_from_start=1
 EOF
 
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index 6f52278..29b34e3 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -10,6 +10,7 @@
 	set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_RevC-2xAEMvA"
 
 	default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
+        default_var generictrace_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/GenericTrace.so"
 else
         # OpenCI enviroment
         source "$ci_root/fvp_utils.sh"
@@ -19,8 +20,8 @@
 	models_dir="$(echo ${fvp_models[$model]} | awk -F ';' '{print $2}')"
         set_model_path "$models_dir"
 
-        # ScalableVectorExtension is located at /opt/model/*/plugins/${model_flavour}
-	default_var etm_plugin_path "${models_dir/models/plugins}/ETMv4ExamplePlugin.so"
+       default_var etm_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/ETMv4ExamplePlugin.so"
+       default_var generictrace_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/GenericTrace.so"
 fi
 
 default_var is_dual_cluster 1