diff --git a/fvp_utils.sh b/fvp_utils.sh
index 99a327c..7ec4fa7 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -63,7 +63,6 @@
 declare -A fvp_models
 fvp_models=(
 [base-aemv8a-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
-[base-aemv8a-latest-revb]="${fvp_arm_std_library};FVP_Base_AEMvA-AEMvA"
 [base-aemva]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
 [base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
 [cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32"
@@ -81,7 +80,6 @@
 [cortex-a73x4-a53x4]="${fvp_arm_std_library};FVP_Base_Cortex-A73x4-A53x4"
 [cortex-a75x4]="${fvp_arm_std_library};FVP_Base_Cortex-A75"
 [cortex-a76aex4]="${fvp_arm_std_library};FVP_Base_Cortex-A76AE"
-[cortex-a76aex2]="${fvp_arm_std_library};FVP_Base_Cortex-A76AE"
 [cortex-a76x4]="${fvp_arm_std_library};FVP_Base_Cortex-A76"
 [cortex-a77x4]="${fvp_arm_std_library};FVP_Base_Cortex-A77"
 [cortex-a78x4]="${fvp_arm_std_library};FVP_Base_Cortex-A78"
diff --git a/group/tf-l2-boot-tests-latest/fvp-default:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-debug b/group/tf-l2-boot-tests-latest/fvp-default:fvp-linux-dtb-fip.uboot-aemv8a_revb-debug
similarity index 100%
rename from group/tf-l2-boot-tests-latest/fvp-default:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-debug
rename to group/tf-l2-boot-tests-latest/fvp-default:fvp-linux-dtb-fip.uboot-aemv8a_revb-debug
diff --git a/group/tf-l2-boot-tests-latest/fvp-tspd-pie:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug b/group/tf-l2-boot-tests-latest/fvp-tspd-pie:fvp-linux-dtb-fip.uboot-aemv8a_revb-tspd-debug
similarity index 100%
rename from group/tf-l2-boot-tests-latest/fvp-tspd-pie:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug
rename to group/tf-l2-boot-tests-latest/fvp-tspd-pie:fvp-linux-dtb-fip.uboot-aemv8a_revb-tspd-debug
diff --git a/group/tf-l2-boot-tests-latest/fvp-tspd:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug b/group/tf-l2-boot-tests-latest/fvp-tspd:fvp-linux-dtb-fip.uboot-aemv8a_revb-tspd-debug
similarity index 100%
rename from group/tf-l2-boot-tests-latest/fvp-tspd:fvp-linux-dtb-fip.uboot-aemv8a_revb.latest-tspd-debug
rename to group/tf-l2-boot-tests-latest/fvp-tspd:fvp-linux-dtb-fip.uboot-aemv8a_revb-tspd-debug
diff --git a/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi-aemv8a_revb.latest b/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi-aemv8a_revb
similarity index 100%
rename from group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi-aemv8a_revb.latest
rename to group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi-aemv8a_revb
diff --git a/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi.debug-aemv8a_revb.latest-debug b/group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi.debug-aemv8a_revb-debug
similarity index 100%
rename from group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi.debug-aemv8a_revb.latest-debug
rename to group/uefi-fvp-boot-tests/fvp-default:fvp-linux.uefi.busybox-fip.uefi.debug-aemv8a_revb-debug
diff --git a/model/base-aemv8a-latest-revb.sh b/model/base-aemv8a-latest-revb.sh
deleted file mode 100644
index f16e78f..0000000
--- a/model/base-aemv8a-latest-revb.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_Base_AEMvA-AEMvA"
-
-default_var is_dual_cluster 1
-
-source "$ci_root/model/base-aemva-common.sh"
-
-cat <<EOF >>"${model_param_file}"
--C bp.terminal_0.start_port=5000
--C bp.terminal_1.start_port=5001
--C bp.terminal_2.start_port=5002
--C bp.terminal_3.start_port=5003
-EOF
diff --git a/run_config/fvp-aemv8a_revb.latest b/run_config/fvp-aemv8a_revb.latest
deleted file mode 100644
index a4c9775..0000000
--- a/run_config/fvp-aemv8a_revb.latest
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
-	local model="base-aemv8a-latest-revb"
-
-	model="$model" gen_model_params
-	model="$model" gen_fvp_yaml
-}