diff --git a/config/cca-3world.yaml b/config/cca-3world.yaml
index 17239e1a0b3deb3189067ed27fc13d1792c66edc..9e4a25b6be1cdc44ab78c9cdcbd37dd4ff82c2da 100644
--- a/config/cca-3world.yaml
+++ b/config/cca-3world.yaml
@@ -116,7 +116,7 @@ build:
     repo:
       edk2:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git
-        revision: 2802_arm_cca_rmm-v1.0-eac5
+        revision: 2802_arm_cca_rmm-v1.0-eac5-patch1
 
     toolchain: aarch64-none-elf-
 
diff --git a/config/cca-edk2.yaml b/config/cca-edk2.yaml
index d26df1c692657ebf9dfea82591a8faea2aec5569..97d93360657cfc488aacb2ebc3ddcb8cf13f1321 100644
--- a/config/cca-edk2.yaml
+++ b/config/cca-edk2.yaml
@@ -53,7 +53,7 @@ build:
     repo:
       edk2:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git
-        revision: 2802_arm_cca_rmm-v1.0-eac5
+        revision: 2802_arm_cca_rmm-v1.0-eac5-patch1
       edk2-platforms:
         remote: https://git.gitlab.arm.com/linux-arm/edk2-platforms-cca.git
         revision: 2802_arm_cca_rmm-v1.0-eac5
diff --git a/config/edk2-base.yaml b/config/edk2-base.yaml
index 08e39f6a70be00631289e9a245362423237baa2b..f7c9da287c0071d54ead45516566c883a8978fa8 100644
--- a/config/edk2-base.yaml
+++ b/config/edk2-base.yaml
@@ -12,7 +12,7 @@ build:
   acpica:
     repo:
       remote: https://github.com/acpica/acpica.git
-      revision: R06_28_23
+      revision: R09_27_24
 
     build:
       - rm -rf ${param:sourcedir}/generate/unix/acpica
@@ -26,10 +26,10 @@ build:
     repo:
       edk2:
         remote: https://github.com/tianocore/edk2.git
-        revision: edk2-stable202311
+        revision: 95d8a1c255cfb8e063d679930d08ca6426eb5701
       edk2-platforms:
         remote: https://github.com/tianocore/edk2-platforms.git
-        revision: 4b07df2e6f3813c6e955197dacb2cdfbe3471caa
+        revision: 5b5885ef3e30a2896f23afd6df3d2dae8d5e51b3
 
     toolchain: aarch64-none-elf-
 
@@ -46,7 +46,7 @@ build:
       -a: AARCH64
       -t: GCC5
       -p: Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
-      -b: RELEASE
+      -b: DEBUG
       --pcd: PcdShellDefaultDelay=0
       ' --pcd': PcdUefiShellDefaultBootEnable=1
 
@@ -56,4 +56,4 @@ build:
       - build -n ${param:jobs} -D EDK2_OUT_DIR=${param:builddir} ${param:join_space}
 
     artifacts:
-      EDK2: ${param:builddir}/RELEASE_GCC5/FV/FVP_AARCH64_EFI.fd
+      EDK2: ${param:builddir}/DEBUG_GCC5/FV/FVP_AARCH64_EFI.fd