diff --git a/steps/improve/finalize_job_count.sh b/steps/improve/finalize_job_count.sh
new file mode 100644
index 00000000..225348e6
--- /dev/null
+++ b/steps/improve/finalize_job_count.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# SPDX-FileCopyrightText: 2024 Gábor Stefanik <netrolller.3d@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# Finalize job count once SMP support is available
+
+cat >> /steps/bootstrap.cfg <<- EOF
+JOBS=${FINAL_JOBS}
+EOF
+
+. /steps/bootstrap.cfg
+. /steps/env
diff --git a/steps/manifest b/steps/manifest
index 719fba7f..7ef64966 100644
--- a/steps/manifest
+++ b/steps/manifest
@@ -119,7 +119,7 @@ build: linux-4.9.10 ( BUILD_LINUX == True )
 jump: break ( INTERNAL_CI == pass1 )
 jump: linux ( CHROOT == False )
 jump: move_disk ( KERNEL_BOOTSTRAP == True )
-improve: update_jobs
+improve: finalize_job_count
 improve: finalize_fhs
 improve: swap ( SWAP_SIZE != 0 )
 build: musl-1.2.4