diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.8_3-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.8_3-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.aarch32.8_3-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.amu.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.amu.aarch32-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemv8a.amu.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemva.aarch32-debug b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemva.aarch32-debug
new file mode 100644
index 0000000..d52947d
--- /dev/null
+++ b/group/tftf-l2-fvp/fvp-aarch32-enable-runtime-instr,fvp-aarch32-default:fvp-tftf-fip.tftf-aemva.aarch32-debug
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2020, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/run_config/juno-tftf-r1 b/run_config/juno-tftf-r1
deleted file mode 100644
index e3e29cf..0000000
--- a/run_config/juno-tftf-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_archive() {
-	set_hook_var "juno_revision" "juno-r1"
-	echo "Choosing juno revision r1"
-}
diff --git a/run_config/juno-tftf-r2 b/run_config/juno-tftf-r2
deleted file mode 100644
index 79298b8..0000000
--- a/run_config/juno-tftf-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_archive() {
-	set_hook_var "juno_revision" "juno-r2"
-	echo "Choosing juno revision r2"
-}