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 018e576..0d502bb 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -292,8 +292,8 @@
 -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
 -C cci550.force_on_from_start=1
+--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