diff --git a/model/base-aemv8a-gic600ae.sh b/model/base-aemv8a-gic600ae.sh
deleted file mode 100644
index b4276e9..0000000
--- a/model/base-aemv8a-gic600ae.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-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_AEMv8A-GIC600AE"
-
-default_var sve_plugin_path "$warehouse/SysGen/PVModelLib/0.0/6415/external/plugins/$model_flavour/sve2-HEAD/ScalableVectorExtension.so"
-
-source "$ci_root/model/base-aemva-common.sh"
-
-# TF-A code maintain GICD and GICR base address at 0x2f000000
-# 0x2f100000 respectively. Model provides provision to only
-# put GICD base address, and there is a calculation to derive
-# GICR base address i.e.
-# GICR base address =  0x2f000000 + (4 + (2 × ITScount)+(RDnum × 2)) << 16
-# Hence to set GICR base address to 0x2f100000, set the
-# ITScount=6 where RDnum=0
-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
-
--C gic_iri.ITS-count=6
-EOF
diff --git a/model/base-aemv8a-quad.sh b/model/base-aemv8a-quad.sh
deleted file mode 100644
index de555c4..0000000
--- a/model/base-aemv8a-quad.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2023 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_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
-
-default_var cluster_0_num_cores 4
-default_var cluster_1_num_cores 4
-default_var cluster_2_num_cores 4
-default_var cluster_3_num_cores 4
-
-reset_var gicv3_gicv2_only
-
-reset_var ccn502_cache_size_in_kbytes
-
-reset_var aarch64_only
-
-source "$ci_root/model/fvp_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
-
-${bmcov_plugin+--plugin=$bmcov_plugin_path}
-
-${cluster_0_num_cores+-C cluster0.NUM_CORES=$cluster_0_num_cores}
-${cluster_1_num_cores+-C cluster1.NUM_CORES=$cluster_1_num_cores}
-${cluster_2_num_cores+-C cluster2.NUM_CORES=$cluster_2_num_cores}
-${cluster_3_num_cores+-C cluster3.NUM_CORES=$cluster_3_num_cores}
-
-${reset_to_bl31+-C cluster0.cpu0.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster0.cpu1.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster0.cpu2.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster0.cpu3.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster1.cpu0.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster1.cpu1.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster1.cpu2.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster1.cpu3.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster2.cpu0.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster2.cpu1.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster2.cpu2.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster2.cpu3.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster3.cpu0.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster3.cpu1.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster3.cpu2.RVBAR=${bl31_addr:?}}
-${reset_to_bl31+-C cluster3.cpu3.RVBAR=${bl31_addr:?}}
-
-${el3_payload_bin+--data cluster0.cpu0=$el3_payload_bin@${el3_payload_addr:?}}
-
-${aarch64_only+-C cluster2.max_32bit_el=-1}
-${aarch64_only+-C cluster3.max_32bit_el=-1}
-
-${gicv3_gicv2_only+-C gicv3.gicv2-only=$gicv3_gicv2_only}
-
-${ccn502_cache_size_in_kbytes+-C ccn502.cache_size_in_kbytes=$ccn502_cache_size_in_kbytes}
-
-${etm_present+-C cluster0.cpu0.etm-present=$etm_present}
-${etm_present+-C cluster0.cpu1.etm-present=$etm_present}
-${etm_present+-C cluster0.cpu2.etm-present=$etm_present}
-${etm_present+-C cluster0.cpu3.etm-present=$etm_present}
-${etm_present+-C cluster1.cpu0.etm-present=$etm_present}
-${etm_present+-C cluster1.cpu1.etm-present=$etm_present}
-${etm_present+-C cluster1.cpu2.etm-present=$etm_present}
-${etm_present+-C cluster1.cpu3.etm-present=$etm_present}
-${etm_present+-C cluster2.cpu0.etm-present=$etm_present}
-${etm_present+-C cluster2.cpu1.etm-present=$etm_present}
-${etm_present+-C cluster2.cpu2.etm-present=$etm_present}
-${etm_present+-C cluster2.cpu3.etm-present=$etm_present}
-${etm_present+-C cluster3.cpu0.etm-present=$etm_present}
-${etm_present+-C cluster3.cpu1.etm-present=$etm_present}
-${etm_present+-C cluster3.cpu2.etm-present=$etm_present}
-${etm_present+-C cluster3.cpu3.etm-present=$etm_present}
-
-EOF
diff --git a/run_config/fvp-aemv8a.quad b/run_config/fvp-aemv8a.quad
deleted file mode 100644
index 9db5828..0000000
--- a/run_config/fvp-aemv8a.quad
+++ /dev/null
@@ -1,18 +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-quad"
-
-	uart="0" set_expect_variable "num_cpus" "16"
-
-	model="$model" \
-		ccn502_cache_size_in_kbytes="0" \
-		gen_model_params
-
-	model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-aemv8a.quad.bmcov b/run_config/fvp-aemv8a.quad.bmcov
deleted file mode 100644
index 7829e16..0000000
--- a/run_config/fvp-aemv8a.quad.bmcov
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
-	local model="base-aemv8a-quad"
-
-	uart="0" set_expect_variable "num_cpus" "16"
-
-	model="$model" \
-		ccn502_cache_size_in_kbytes="0" \
-		bmcov_plugin="1" \
-		bmcov_plugin_path="${coverage_trace_plugin}" \
-		gen_model_params
-
-	model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-aemv8a_gic600ae b/run_config/fvp-aemv8a_gic600ae
deleted file mode 100644
index fdca2d2..0000000
--- a/run_config/fvp-aemv8a_gic600ae
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
-	local model="base-aemv8a-gic600ae"
-
-	model="$model" gen_model_params
-	model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-aemv8a_gic600ae.aarch32 b/run_config/fvp-aemv8a_gic600ae.aarch32
deleted file mode 100644
index 5b63251..0000000
--- a/run_config/fvp-aemv8a_gic600ae.aarch32
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
-	local model="base-aemv8a-gic600ae"
-
-	model="$model" aarch32="1" gen_model_params
-	model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-aemv8a_gic600ae.aarch32.bmcov b/run_config/fvp-aemv8a_gic600ae.aarch32.bmcov
deleted file mode 100644
index b5aecd2..0000000
--- a/run_config/fvp-aemv8a_gic600ae.aarch32.bmcov
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
-	local model="base-aemv8a-gic600ae"
-
-	model="$model" aarch32="1" bmcov_plugin="1" \
-		bmcov_plugin_path="${coverage_trace_plugin}" \
-		gen_model_params
-	model="$model" gen_fvp_yaml
-}
diff --git a/run_config/fvp-aemv8a_gic600ae.bmcov b/run_config/fvp-aemv8a_gic600ae.bmcov
deleted file mode 100644
index 4bcface..0000000
--- a/run_config/fvp-aemv8a_gic600ae.bmcov
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-generate_lava_job() {
-	local model="base-aemv8a-gic600ae"
-
-	model="$model" bmcov_plugin="1" \
-		bmcov_plugin_path="${coverage_trace_plugin}" \
-		gen_model_params
-	model="$model" gen_fvp_yaml
-}