diff --git a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.nrd-fip.nrd-rdn1edge-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests-coverage/fvp-rdn1edge,fvp-rdn1edge-tbb:fvp-linux.sgi-fip.sgi-rdn1edge-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.nrd-fip.nrd-rdv1-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov b/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests-coverage/fvp-rdv1,fvp-rdv1-tbb:fvp-linux.sgi-fip.sgi-rdv1-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
diff --git a/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug-bmcov b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug-bmcov
new file mode 100644
index 0000000..892d94a
--- /dev/null
+++ b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.nrd-fip.nrd-sgi575-debug-bmcov
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov b/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov
deleted file mode 100644
index d52947d..0000000
--- a/group/scp-boot-tests-coverage/fvp-sgi575,fvp-sgi575-tbb:fvp-linux.sgi-fip.sgi-sgi575-debug-bmcov
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-