diff --git a/config/cca-3world.yaml b/config/cca-3world.yaml
index 881d47e2fa57590092a989cbfd74ce192d75a6a0..5dbada5b8d51c36c06b5a88ce188b407c1a8e5de 100644
--- a/config/cca-3world.yaml
+++ b/config/cca-3world.yaml
@@ -114,7 +114,7 @@ build:
     repo:
       edk2:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git
-        revision: 2802_arm_cca_rmm-v1.0-eac5-patch1
+        revision: 3223_arm_cca_rmm_v1.0_rel0_v3
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/cca-edk2.yaml b/config/cca-edk2.yaml
index 8b2abb470103d54e39defc6a6527022b8440ff2a..206a13b74f64f2e843f800bc967d096eb6717edc 100644
--- a/config/cca-edk2.yaml
+++ b/config/cca-edk2.yaml
@@ -52,7 +52,7 @@ build:
     repo:
       edk2:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git
-        revision: 2802_arm_cca_rmm-v1.0-eac5-patch1
+        revision: 3223_arm_cca_rmm_v1.0_rel0_v3
       edk2-platforms:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-platforms-cca.git
-        revision: 2802_arm_cca_rmm-v1.0-eac5
+        revision: 3223_arm_cca_rmm_v1.0_rel0_v3