diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 378d5cd..d402740 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,9 +13,6 @@ permissions:
       id-token: write
       contents: read
 
-env:
-  MAKEFLAGS: -j2
-
 jobs:
   build-boot-x86:
     runs-on: ubuntu-latest
diff --git a/scripts/build-atf b/scripts/build-atf
index afcd3de..38bab45 100755
--- a/scripts/build-atf
+++ b/scripts/build-atf
@@ -32,4 +32,4 @@ fi
 export CROSS_COMPILE=$(dirname $(which "${TUPLE}-gcc"))/"${TUPLE}-"
 
 # Build ATF
-make ${MAKEFLAGS} PLAT="${PLAT}" DEBUG=1 bl31
+make ${MAKEFLAGS:--j$(nproc)} PLAT="${PLAT}" DEBUG=1 bl31
diff --git a/scripts/build-u_boot b/scripts/build-u_boot
index d5041c6..f519d5f 100755
--- a/scripts/build-u_boot
+++ b/scripts/build-u_boot
@@ -32,4 +32,4 @@ fi
 export CROSS_COMPILE=$(dirname $(which "${TUPLE}-gcc"))/"${TUPLE}-"
 
 # Build U-Boot
-make ${MAKEFLAGS} "${DEFCONFIG}" && make ${MAKEFLAGS}
+make ${MAKEFLAGS} "${DEFCONFIG}" && make ${MAKEFLAGS:--j$(nproc)}