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}"