diff --git a/config/arch/v9.0.yaml b/config/arch/v9.0.yaml
index a5c7308c9dcdb3ac2e2204b70f2c34c04380b094..170418e4f2b5bf77d5ff0455441b48ebd3e223ed 100644
--- a/config/arch/v9.0.yaml
+++ b/config/arch/v9.0.yaml
@@ -15,6 +15,8 @@ layers:
 build:
   tfa:
     params:
+      ARM_ARCH_MAJOR: 9
+      ARM_ARCH_MINOR: 0
       CTX_INCLUDE_AARCH32_REGS: 0
 
 run:
diff --git a/config/arch/v9.1.yaml b/config/arch/v9.1.yaml
index 47c5697be5d715f4958108eccdf6e8250f9a3856..f527e9e18875bd63e18a07fa1d0f3cb38f641838 100644
--- a/config/arch/v9.1.yaml
+++ b/config/arch/v9.1.yaml
@@ -13,6 +13,12 @@ layers:
   - arch/v8.6.yaml
   - arch/v9.0.yaml
 
+build:
+  tfa:
+    params:
+      ARM_ARCH_MAJOR: 9
+      ARM_ARCH_MINOR: 1
+
 run:
   params:
     -C cluster0.has_arm_v9-1: 1
diff --git a/config/arch/v9.2.yaml b/config/arch/v9.2.yaml
index f00fb2e522d70892e782d4beec78f6f36304a826..e909d4a19569f5626a537ae63ebc3cea567b02e0 100644
--- a/config/arch/v9.2.yaml
+++ b/config/arch/v9.2.yaml
@@ -13,6 +13,12 @@ layers:
   - arch/v8.7.yaml
   - arch/v9.1.yaml
 
+build:
+  tfa:
+    params:
+      ARM_ARCH_MAJOR: 9
+      ARM_ARCH_MINOR: 2
+
 run:
   params:
     -C cluster0.has_arm_v9-2: 1
diff --git a/config/cca-3world.yaml b/config/cca-3world.yaml
index ea555e6d6f01c1657665c012dd7ce5d76c3629a4..c7f713d5ae02db2b4862dbd0b233e4233320cda1 100644
--- a/config/cca-3world.yaml
+++ b/config/cca-3world.yaml
@@ -215,6 +215,17 @@ run:
   params:
     -C cluster0.rme_support_level: 2
     -C cluster1.rme_support_level: 2
+    -C bp.secure_memory: 0                                            # Disable security checking by TZC-400
+    -C bp.has_rme: 1                                                  # Enable Realm Management Extension(RME) support
+                                                                      # Only Root access to Trusted ROM and SRAM.
+                                                                      # SECURE/ROOT access only for below peripherals:
+                                                                      # -Trusted DRAM
+                                                                      # -REFCLK CNTControl (Generic Timer)
+                                                                      # -Trusted Watchdog SP805, Trustzone address space controller
+                                                                      # -AP_REFCLK CNTBase0 (Generic Timer)
+                                                                      # -Trusted RNG, Non-Volatile Counter and Root-Key Storage
+                                                                      # -Flash0, Flash1
+                                                                      # -uart0, uart1, uart2, uart3
 
     # Suppress "WARNING: MPAM_NS is deprecated when RME is in use. Should use MPAM_SP"
     -C cluster0.output_attributes: ExtendedID[62:55]=MPAM_PMG,ExtendedID[54:39]=MPAM_PARTID,ExtendedID[38:37]=MPAM_SP
diff --git a/config/cca-4world.yaml b/config/cca-4world.yaml
index d732314562326c37a90a92b09c4e2566d5543214..cbdb64e76dfbd49a562f187f761dd9fa567e60f8 100644
--- a/config/cca-4world.yaml
+++ b/config/cca-4world.yaml
@@ -56,9 +56,3 @@ run:
   terminals:
     bp.terminal_2:
       friendly: hafnium
-
-  # SPMD doesn't permit use of SME options:
-  # https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/plat/arm/board/fvp/platform.mk?h=v2.10#n60
-  # This is mainly because Hafnium/S-EL2 doesn't support (yet) saving/restoring the NS SME state across SMC calls.
-  params:
-    -C SVE.ScalableVectorExtension.has_sme: 0
diff --git a/config/hafnium-base.yaml b/config/hafnium-base.yaml
index 2b40273953a401c13278eb9acbce6462e15dab26..ad0e8115621712ac3aa6e2f435cbbef1d99f1665 100644
--- a/config/hafnium-base.yaml
+++ b/config/hafnium-base.yaml
@@ -10,7 +10,7 @@ build:
   hafnium:
     repo:
       remote: https://git.trustedfirmware.org/hafnium/hafnium.git
-      revision: v2.10
+      revision: v2.11
 
     params:
       PROJECT: reference
@@ -31,8 +31,9 @@ build:
       # still a few, which are required by Hafnium, which it can't. Given these
       # are hard requirements for Hafnium, define them here.
       GIC_EXT_INTID: 1
-      CTX_INCLUDE_MTE_REGS: 1
+      ENABLE_FEAT_MTE2: 1
       ENABLE_SVE_FOR_SWD: 1
+      ENABLE_SME_FOR_SWD: 1
 
 run:
   params:
diff --git a/config/rmm-base.yaml b/config/rmm-base.yaml
index 6b7da94322863b782a7ff455b4065e96905ed61c..162e78135cf9ce09458e7ddd845e5b152372f2d3 100644
--- a/config/rmm-base.yaml
+++ b/config/rmm-base.yaml
@@ -7,7 +7,7 @@ build:
   rmm:
     repo:
       remote: https://git.trustedfirmware.org/TF-RMM/tf-rmm.git
-      revision: tf-rmm-v0.4.0
+      revision: tf-rmm-v0.5.0
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/tfa-base.yaml b/config/tfa-base.yaml
index ea9e71439a6e21b0b2d8898066df50bc3976c1cd..fd6f1ca8e8b2aa21ce762f2faf30dc984ee13824 100644
--- a/config/tfa-base.yaml
+++ b/config/tfa-base.yaml
@@ -11,7 +11,7 @@ build:
   tfa:
     repo:
       remote: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
-      revision: v2.10
+      revision: v2.11
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/tftf-base.yaml b/config/tftf-base.yaml
index 55e1831abf1f029d5218616776b3bfa0a6fe9462..74cde398d8c8bdbc6308772e31236e31f1541c8e 100644
--- a/config/tftf-base.yaml
+++ b/config/tftf-base.yaml
@@ -12,7 +12,7 @@ build:
   tftf:
     repo:
       remote: https://git.trustedfirmware.org/TF-A/tf-a-tests.git
-      revision: v2.10
+      revision: v2.11
 
     toolchain: aarch64-none-elf-