diff --git a/config/buildroot-cca.yaml b/config/buildroot-cca.yaml
index e230bab2ed5e50d7fecee8e43cf64b468a379e64..6f92d5db2d567fcabcccbf70d5eb2b1257e8bcf3 100644
--- a/config/buildroot-cca.yaml
+++ b/config/buildroot-cca.yaml
@@ -68,7 +68,7 @@ build:
   buildroot-external-cca:
     repo:
       remote: https://git.codelinaro.org/linaro/dcap/buildroot-external-cca.git
-      revision: main
+      revision: cca/v8
 
     artifacts:
       BUILDROOT_EXTERNAL_CCA:
diff --git a/config/cca-3world.yaml b/config/cca-3world.yaml
index 88c1b0542d21b1c6b0e56f439dc3c1b32b9848b8..ffaf98b96ba9cc24625e0312c18ae977f43ad919 100644
--- a/config/cca-3world.yaml
+++ b/config/cca-3world.yaml
@@ -112,7 +112,7 @@ build:
   linux:
     repo:
       remote: https://git.gitlab.arm.com/linux-arm/linux-cca.git
-      revision: cca-host/v7
+      revision: cca-host/v8
     prebuild:
       # Use source dir modification time as timestamp (for locally reproducible build)
       - export KBUILD_BUILD_TIMESTAMP="@$$(stat -c '%Y' ${param:sourcedir})"
@@ -126,13 +126,13 @@ build:
         revision: v1.6.1
       kvmtool:
         remote: https://gitlab.arm.com/linux-arm/kvmtool-cca
-        revision: cca/v5
+        revision: cca/v6
 
   edk2-cca-guest:
     repo:
       edk2:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git
-        revision: 3223_arm_cca_rmm_v1.0_rel0_v3_patch1
+        revision: 3223_arm_cca_v4
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/cca-edk2.yaml b/config/cca-edk2.yaml
index 9ed1222d9638df3e1017457837005d6243d0e5f9..b977bc76b4dbf73e70afa046844ab0bbe9bc4613 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: 3223_arm_cca_rmm_v1.0_rel0_v3_patch1
+        revision: 3223_arm_cca_v4
       edk2-platforms:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-platforms-cca.git
-        revision: 3223_arm_cca_rmm_v1.0_rel0_v3
+        revision: 3223_arm_cca_v4