diff --git a/group/tf-l1-build-fvp/fvp-mb-romlib-rme-rss:nil b/group/tf-l1-build-fvp/fvp-mb-romlib-rme-rss:nil
deleted file mode 100644
index 35f8713..0000000
--- a/group/tf-l1-build-fvp/fvp-mb-romlib-rme-rss:nil
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Copyright (c) 2022 Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
diff --git a/group/tf-l1-build-fvp/fvp-mb-romlib-rss:nil b/group/tf-l1-build-fvp/fvp-mb-romlib-rss:nil
new file mode 100644
index 0000000..b452bbf
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-mb-romlib-rss:nil
@@ -0,0 +1,5 @@
+#
+# Copyright (c) 2023 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index d698a4a..6aee4ac 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -68,8 +68,8 @@
 # Coverity. In reality, RSS is not supported on FVP right now (or on any other
 # upstream platform, for that matter) so the resulting firmware would not be
 # functional.
-clean_build $fvp_common_flags ${ARM_TBB_OPTIONS} USE_ROMLIB=1 \
-	    ENABLE_RME=1 MEASURED_BOOT=1 PLAT_RSS_NOT_SUPPORTED=0
+clean_build $fvp_common_flags USE_ROMLIB=1 MEASURED_BOOT=1 \
+    PLAT_RSS_NOT_SUPPORTED=0
 
 clean_build $fvp_common_flags SPD=trusty
 clean_build $fvp_common_flags SPD=trusty TRUSTY_SPD_WITH_GENERIC_SERVICES=1
diff --git a/tf_config/fvp-mb-romlib-rme-rss b/tf_config/fvp-mb-romlib-rss
similarity index 91%
rename from tf_config/fvp-mb-romlib-rme-rss
rename to tf_config/fvp-mb-romlib-rss
index 349cf5a..53ad3bb 100644
--- a/tf_config/fvp-mb-romlib-rme-rss
+++ b/tf_config/fvp-mb-romlib-rss
@@ -1,5 +1,4 @@
 CROSS_COMPILE=aarch64-none-elf-
-ENABLE_RME=1
 FVP_HW_CONFIG_DTS=fdts/fvp-base-gicv3-psci-1t.dts
 MEASURED_BOOT=1
 PLAT=fvp