diff --git a/ci/build.sh b/ci/build.sh
index 99ae979..a907ebf 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -6,7 +6,7 @@
 ZUUL_JOB_NAME=$(jq < ~/zuul-env.json -r '.job')
 ZUUL_PROJECT_SRC_DIR=$HOME/$(jq < ~/zuul-env.json -r '.project.src_dir')
 ZUUL_PROJECT_SHORT_NAME=$(jq < ~/zuul-env.json -r '.project.short_name')
-CI_PARALLEL_JOBS=$(grep -c '^processor' /proc/cpuinfo)
+CI_PARALLEL_JOBS=$(awk -vcpu=$(getconf _NPROCESSORS_ONLN) 'BEGIN{printf "%.0f", cpu*1.3+1}')
 
 BUILD_DIR=~/build
 mkdir ${BUILD_DIR}
@@ -22,10 +22,9 @@
 fi
 
 echo BR2_PRIMARY_SITE=\"https://ci-logs.gerrit.cesnet.cz/t/public/mirror/buildroot\" >> .config
-make source
+make source -j${CI_PARALLEL_JOBS} --output-sync=target
 
-sed -i 's/^\(\.NOTPARALLEL\).*/#\1/' ${ZUUL_PROJECT_SRC_DIR}/submodules/buildroot/Makefile
-make -j${CI_PARALLEL_JOBS}
+make -j${CI_PARALLEL_JOBS} --output-sync=target
 mv images/update.raucb ~/zuul-output/artifacts/
 
 if [[ "${ZUUL_JOB_NAME}" =~ clearfog ]]; then
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index bf75605..2edaccf 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -8,6 +8,7 @@
 BR2_STRIP_EXCLUDE_DIRS="/usr/lib/libyang /usr/lib/sysrepo"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/patches"
 BR2_REPRODUCIBLE=y
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_SSP_STRONG=y
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
diff --git a/submodules/buildroot b/submodules/buildroot
index e5b1510..f83fe69 160000
--- a/submodules/buildroot
+++ b/submodules/buildroot
@@ -1 +1 @@
-Subproject commit e5b1510a81bda096dacc133276f1ff2643131dcc
+Subproject commit f83fe6938fcebe31ee6222b8d405f00ac0c1d753