diff --git a/fvp_utils.sh b/fvp_utils.sh
index 574b3da..012f20a 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -45,12 +45,8 @@
 default_model_dtb="dtb.bin"
 
 # FVP containers and model paths
-fvp_arm_std_library_11_17="fvp:fvp_arm_std_library_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_ARM_Std_Library/FVP_Base"
-
 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_aemv8a_gic600ae="fvp:fvp_base_aemv8a-gic600ae_${model_version_11_17}_${model_build_11_17};/opt/model/FVP_Base_AEMv8A-GIC600AE_pkg/models/${model_flavour_11_17}"
-fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502="fvp:fvp_base_aemv8a-aemv8a-aemv8a-aemv8a-ccn502_${model_version}_${model_build};/opt/model/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502_pkg/models/${model_flavour}"
 fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
 
 # CSS model list
@@ -67,11 +63,9 @@
 
 declare -A fvp_models
 fvp_models=(
-[base-aemv8a-quad]="${fvp_base_aemv8a_aemv8a_aemv8a_aemv8a_ccn502};FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
 [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-gic600ae]="${fvp_base_aemv8a_gic600ae};FVP_Base_AEMv8A-GIC600AE"
 [base-aemv8a]="${fvp_base_revc_2xaemva};FVP_Base_RevC-2xAEMvA"
 [cortex-a32x4]="${fvp_arm_std_library};FVP_Base_Cortex-A32x4"
 [cortex-a35x4]="${fvp_arm_std_library};FVP_Base_Cortex-A35x4"
diff --git a/group/tf-l2-boot-tests-misc/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a_gic600ae.aarch32-debug b/group/tf-l2-boot-tests-misc/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a_gic600ae.aarch32-debug
deleted file mode 100644
index 1bbc737..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-aarch32-default,fvp-aarch32-default:fvp-tftf.aarch32-fip.tftf-aemv8a_gic600ae.aarch32-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a_gic600ae-debug b/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a_gic600ae-debug
deleted file mode 100644
index 1bbc737..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-default,fvp-default:fvp-tftf-fip.tftf-aemv8a_gic600ae-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2021 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug b/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug
deleted file mode 100644
index aab4796..0000000
--- a/group/tf-l2-boot-tests-misc/fvp-tspd-quad-cluster:fvp-linux.quad-dtb.quad-fip.uboot-aemv8a.quad-tspd-debug
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/tftf-l2-fvp/fvp-tspd-quad-cluster,fvp-4x4:fvp-tftf-fip.tftf-aemv8a.quad-tspd-debug b/group/tftf-l2-fvp/fvp-tspd-quad-cluster,fvp-4x4:fvp-tftf-fip.tftf-aemv8a.quad-tspd-debug
deleted file mode 100644
index 0a342ff..0000000
--- a/group/tftf-l2-fvp/fvp-tspd-quad-cluster,fvp-4x4:fvp-tftf-fip.tftf-aemv8a.quad-tspd-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/model/base-aemv8a-gic600ae.sh b/model/base-aemv8a-gic600ae.sh
index 32f0c1c..b4276e9 100644
--- a/model/base-aemv8a-gic600ae.sh
+++ b/model/base-aemv8a-gic600ae.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_AEMv8A-GIC600AE"
+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"
 
diff --git a/model/base-aemv8a-quad.sh b/model/base-aemv8a-quad.sh
index d4f41bc..de555c4 100644
--- a/model/base-aemv8a-quad.sh
+++ b/model/base-aemv8a-quad.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-set_model_path "$warehouse/SysGen/Models/$model_version_11_17/$model_build_11_17/external/models/$model_flavour_11_17/FVP_Base_AEMv8A-AEMv8A-AEMv8A-AEMv8A-CCN502"
+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
diff --git a/utils.sh b/utils.sh
index 6c66eee..6f57764 100644
--- a/utils.sh
+++ b/utils.sh
@@ -542,11 +542,6 @@
 jenkins_url="${JENKINS_URL%/*}"
 jenkins_url="${jenkins_url:-https://ci.trustedfirmware.org/}"
 
-# 11.17 Model revisions
-model_version_11_17="11.17"
-model_build_11_17="21"
-model_flavour_11_17="Linux64_GCC-9.3"
-
 # Model revisions
 model_version="${model_version:-11.26}"
 model_build="${model_build:-11}"