diff --git a/model/base-aemva-common.sh b/model/base-aemva-common.sh
index 29251cc..95b9261 100644
--- a/model/base-aemva-common.sh
+++ b/model/base-aemva-common.sh
@@ -82,6 +82,9 @@
 # Trace buffer control register support
 reset_var supports_trace_buffer_control_regs
 
+# CRC32 support
+reset_var supports_crc32
+
 source "$ci_root/model/fvp_common.sh"
 
 #------------ Common configuration --------------
@@ -192,6 +195,10 @@
 ${supports_trace_filter_regs+-C cluster0.has_self_hosted_trace_extension=$supports_trace_filter_regs}
 ${supports_trace_buffer_control_regs+-C cluster0.has_trbe=$supports_trace_buffer_control_regs}
 ${supports_branch_record_buffer_control_regs+-C cluster0.has_brbe=$supports_branch_record_buffer_control_regs}
+${supports_crc32+-C cluster0.cpu0.enable_crc32=$supports_crc32}
+${supports_crc32+-C cluster0.cpu1.enable_crc32=$supports_crc32}
+${supports_crc32+-C cluster0.cpu2.enable_crc32=$supports_crc32}
+${supports_crc32+-C cluster0.cpu3.enable_crc32=$supports_crc32}
 
 EOF
 
@@ -346,6 +353,10 @@
 ${etm_present+-C cluster1.cpu3.etm-present=$etm_present}
 ${supports_system_trace_filter_regs+-C cluster1.has_self_hosted_trace_extension=$supports_system_trace_filter_regs}
 ${supports_trace_buffer_control_regs+-C cluster1.has_trbe=$supports_trace_buffer_control_regs}
+${supports_crc32+-C cluster1.cpu0.enable_crc32=$supports_crc32}
+${supports_crc32+-C cluster1.cpu1.enable_crc32=$supports_crc32}
+${supports_crc32+-C cluster1.cpu2.enable_crc32=$supports_crc32}
+${supports_crc32+-C cluster1.cpu3.enable_crc32=$supports_crc32}
 
 EOF
 
diff --git a/run_config/fvp-aemv8a.gpt b/run_config/fvp-aemv8a.gpt
index c1de759..2aa7678 100644
--- a/run_config/fvp-aemv8a.gpt
+++ b/run_config/fvp-aemv8a.gpt
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -9,6 +9,7 @@
         local model="base-aemv8a"
 
         fip_as_gpt="1" \
+        supports_crc32="1" \
         model="$model" gen_model_params
 
         model="$model" gen_fvp_yaml