diff --git a/group/tf-l1-build-fvp/fvp-tbb-psa-mbedtls-enc-bl31:nil b/group/tf-l1-build-fvp/fvp-tbb-psa-mbedtls-enc-bl31:nil
new file mode 100644
index 0000000..b5a3cc6
--- /dev/null
+++ b/group/tf-l1-build-fvp/fvp-tbb-psa-mbedtls-enc-bl31:nil
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
diff --git a/tf_config/fvp-tbb-psa-mbedtls-enc-bl31 b/tf_config/fvp-tbb-psa-mbedtls-enc-bl31
new file mode 100644
index 0000000..2a1362e
--- /dev/null
+++ b/tf_config/fvp-tbb-psa-mbedtls-enc-bl31
@@ -0,0 +1,9 @@
+ARM_ROTPK_LOCATION=devel_rsa
+CROSS_COMPILE=aarch64-none-elf-
+FVP_TRUSTED_SRAM_SIZE=384
+TRUSTED_BOARD_BOOT=1
+ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
+PLAT=fvp
+PSA_CRYPTO=1
+DECRYPTION_SUPPORT=aes_gcm
+ENCRYPT_BL31=1
\ No newline at end of file