diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index 1ee28231d..94d916bff 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -54,9 +54,9 @@ commands:
     parameters:
       count:
         type: integer
-        # It reports 36 cores and ninja goes with 38 currently, still randomly
-        # dies with 24. RAM fluctuates from 10 to 20 GB.
-        default: 16
+        # It reports 36 cores and ninja goes with 38 currently, RAM fluctuates
+        # from 3 to 70 GB.
+        default: 24
     steps:
     - run:
         name: Query CPU cores, default Ninja parallelism and available RAM, cap jobs
@@ -256,6 +256,11 @@ jobs:
     steps:
     - install-base-linux:
         extra: cmake libsdl2-dev libglfw3-dev libvulkan-dev wget unzip
+    # It crashes with the default setting. Only on GCC, usually when the huge
+    # TradeAbstractImporterTest / TradeMaterialDataTest / TradeSceneDataTest
+    # get involved.
+    # TODO: revisit when we get rid of more STL
+    - cap-ninja-jobs
     - install-swiftshader-vulkan:
         build: ubuntu-18.04
     - build:
@@ -466,8 +471,6 @@ jobs:
       TARGET_GLES2: "ON"
     steps:
     - install-base-linux
-    # The build is extremely flaky lately (Mar 2021). Not sure why it wasn't a
-    # problem before.
     - cap-ninja-jobs
     - build:
         script: emscripten.sh
@@ -479,8 +482,6 @@ jobs:
       TARGET_GLES2: "OFF"
     steps:
     - install-base-linux
-    # The build is extremely flaky lately (Mar 2021). Not sure why it wasn't a
-    # problem before.
     - cap-ninja-jobs
     - build:
         script: emscripten.sh
diff --git a/package/ci/emscripten.sh b/package/ci/emscripten.sh
index 66bc6a8f8..64c14d5ca 100755
--- a/package/ci/emscripten.sh
+++ b/package/ci/emscripten.sh
@@ -70,7 +70,7 @@ cmake .. \
     -DBUILD_GL_TESTS=ON \
     -DTARGET_GLES2=$TARGET_GLES2 \
     -G Ninja
-ninja
+ninja $NINJA_JOBS
 
 # Test
 CORRADE_TEST_COLOR=ON ctest -V -E "GLTest|GLBenchmark|ALTest"
diff --git a/package/ci/unix-desktop-vulkan.sh b/package/ci/unix-desktop-vulkan.sh
index c57021c4e..4d0e67131 100755
--- a/package/ci/unix-desktop-vulkan.sh
+++ b/package/ci/unix-desktop-vulkan.sh
@@ -69,7 +69,7 @@ cmake .. \
     -DBUILD_VK_TESTS=ON \
     -DBUILD_DEPRECATED=$BUILD_DEPRECATED \
     -G Ninja
-ninja
+ninja $NINJA_JOBS
 
 export VK_ICD_FILENAMES=$HOME/swiftshader/share/vulkan/icd.d/vk_swiftshader_icd.json
 export CORRADE_TEST_COLOR=ON