diff --git a/config/edk2-base.yaml b/config/edk2-base.yaml
index dc3ea48206f3f545fc645a965c60ffa17a23c066..13981fb9d99d220b04673a737637502060511b9a 100644
--- a/config/edk2-base.yaml
+++ b/config/edk2-base.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2022, Arm Limited.
+# Copyright (c) 2024, Arm Limited.
 # SPDX-License-Identifier: MIT
 
 %YAML 1.2
@@ -22,38 +22,53 @@ build:
         path: ${param:sourcedir}/generate/unix/bin
         export: false
 
+  edk2-platforms:
+    repo:
+      remote: https://github.com/tianocore/edk2-platforms.git
+      revision: 5b5885ef3e30a2896f23afd6df3d2dae8d5e51b3
+
+    artifacts:
+      # Share the source directory with EDK2
+      EDK2_PLATFORMS:
+        path: ${param:sourcedir}
+        export: false
+
   edk2:
     repo:
-      edk2:
-        remote: https://github.com/tianocore/edk2.git
-        revision: 95d8a1c255cfb8e063d679930d08ca6426eb5701
-      edk2-platforms:
-        remote: https://github.com/tianocore/edk2-platforms.git
-        revision: 5b5885ef3e30a2896f23afd6df3d2dae8d5e51b3
+      remote: https://github.com/tianocore/edk2.git
+      revision: 95d8a1c255cfb8e063d679930d08ca6426eb5701
 
     toolchain: aarch64-none-elf-
 
     stderrfilt: true
 
     prebuild:
-      - export WORKSPACE=${param:sourcedir}
+      # Change working directory to reduce build artifacts in repo
+      - export WORKSPACE=${param:builddir}
+      - export CONF_PATH=${param:builddir}/Conf
+      - export EDK_TOOLS_PATH=${param:sourcedir}/BaseTools
       - export GCC5_AARCH64_PREFIX=$$CROSS_COMPILE
-      - export PACKAGES_PATH=$$WORKSPACE/edk2:$$WORKSPACE/edk2-platforms
+      - export PACKAGES_PATH=${param:sourcedir}:${artifact:EDK2_PLATFORMS}
       - export IASL_PREFIX=${artifact:ACPICA}/
       - export PYTHON_COMMAND=/usr/bin/python3
 
+      # Pre-build steps: create configuration + compile tools
+      - mkdir -p $$CONF_PATH
+      - source ${param:sourcedir}/edksetup.sh --reconfig
+      - make -j${param:jobs} -C $$EDK_TOOLS_PATH
+
     params:
       -a: AARCH64
       -t: GCC5
-      -p: Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
       -b: DEBUG
-      --pcd: PcdShellDefaultDelay=0
-      ' --pcd': PcdUefiShellDefaultBootEnable=1
+      -n: ${param:jobs}
 
     build:
-      - source edk2/edksetup.sh --reconfig
-      - make -j${param:jobs} -C edk2/BaseTools
-      - build -n ${param:jobs} -D EDK2_OUT_DIR=${param:builddir} ${param:join_space}
+      - build ${param:join_space}
+          -p Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+          -D EDK2_OUT_DIR=${param:builddir}
+          --pcd PcdShellDefaultDelay=0
+          --pcd PcdUefiShellDefaultBootEnable=1
 
     artifacts:
       EDK2: ${param:builddir}/DEBUG_GCC5/FV/FVP_AARCH64_EFI.fd