diff --git a/fvp_utils.sh b/fvp_utils.sh
index 1333bff..802d072 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -44,7 +44,7 @@
 fvp_arm_std_library_11_24="fvp:fvp_arm_std_library_${model_version_11_24}_${model_build_11_24};/opt/model/FVP_ARM_Std_Library/FVP_Base"
 
 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}"
 
 # CSS model list
@@ -368,13 +368,10 @@
         [coverage_trace_plugin]="coverage_trace.so"
         [dtb]="dtb.bin"
         [el3_payload]="el3_payload.bin"
-        [ete_trace]="libete-plugin.so"
-        [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"
@@ -415,13 +412,10 @@
         [coverage_trace_plugin]="${coverage_trace_plugin}"
         [dtb]="$(fvp_gen_bin_url ${model_dtb})"
         [el3_payload]="$(fvp_gen_bin_url el3_payload.bin)"
-        [ete_trace]="${tfa_downloads}/FastModelsPortfolio_${model_version}/plugins/${model_flavour}/libete-plugin.so"
-        [etm_trace]="${tfa_downloads}/FastModelsPortfolio_${model_version}/plugins/${model_flavour}/ETMv4ExamplePlugin.so"
         [fip]="$(fvp_gen_bin_url fip.bin)"
         [fip_gpt]="$(fvp_gen_bin_url fip_gpt.bin)"
         [fvp_spmc_manifest_dtb]="$(fvp_gen_bin_url fvp_spmc_manifest.dtb)"
         [fwu_fip]="$(fvp_gen_bin_url fwu_fip.bin)"
-        [generic_trace]="${tfa_downloads}/FastModelsPortfolio_${model_version}/plugins/${model_flavour}/GenericTrace.so"
         [hafnium]="$(fvp_gen_bin_url hafnium.bin)"
         [image]="$(fvp_gen_bin_url kernel.bin)"
         [ivy]="$(fvp_gen_bin_url ivy.pkg)"
@@ -467,12 +461,9 @@
         ["[= ]busybox.bin"]="={BUSYBOX}"
         ["[= ]dtb.bin"]="={DTB}"
         ["[= ]el3_payload.bin"]="={EL3_PAYLOAD}"
-        ["[= ].*libete-plugin.so"]="={ETE_TRACE}"
-        ["[= ].*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 dee114b..7233d09 100644
--- a/model/base-aemv8a.sh
+++ b/model/base-aemv8a.sh
@@ -11,6 +11,7 @@
 
 	default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
 	default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.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"
@@ -20,9 +21,9 @@
 	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 ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so"
+        default_var ete_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/libete-plugin.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 3eaf643..555127d 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -238,7 +238,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
 EOF
 
 # If RME is implemented:
diff --git a/model/base-aemva.sh b/model/base-aemva.sh
index dee114b..d5f456e 100644
--- a/model/base-aemva.sh
+++ b/model/base-aemva.sh
@@ -11,6 +11,7 @@
 
 	default_var etm_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/ETMv4ExamplePlugin.so"
 	default_var ete_plugin_path "$warehouse/SysGen/PVModelLib/$model_version/$model_build/external/plugins/$model_flavour/libete-plugin.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"
@@ -20,9 +21,10 @@
 	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 ete_plugin_path "${models_dir/models/plugins}/libete-plugin.so"
+	default_var ete_plugin_path "/opt/model/Base_RevC_AEMvA_pkg/plugins/Linux64_GCC-9.3/libete-plugin.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