diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index f82254895..939233540 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -271,7 +271,7 @@ jobs:
         extra: libgl1-mesa-dev libsdl2-dev libglfw3-dev libopenal-dev libvulkan-dev
     # In this case it gets stuck even with 24 jobs. Only on GCC, usually when
     # the huge TradeAbstractImporterTest / TradeMaterialDataTest get involved.
-    # TODO: revisit when we get rid of more STL
+    # TODO: revisit when we get rid of more STL / deprecated includes
     - cap-ninja-jobs:
         count: 20
     - install-gcc-4_8
@@ -310,7 +310,7 @@ jobs:
     # 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
+    # TODO: revisit when we get rid of more STL / deprecated includes
     - cap-ninja-jobs
     - install-gcc-4_8
     - install-swiftshader-vulkan:
@@ -331,11 +331,11 @@ jobs:
     steps:
     - install-base-linux:
         extra: libsdl2-dev libglfw3-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
+    # In this case it gets stuck even with 24 jobs. Only on GCC, usually when
+    # the huge TradeAbstractImporterTest / TradeMaterialDataTest get involved.
+    # TODO: revisit when we get rid of more STL / deprecated includes
+    - cap-ninja-jobs:
+        count: 20
     - install-gcc-4_8
     - install-cmake:
         version: "3.4.3"
@@ -357,11 +357,11 @@ jobs:
     steps:
     - install-base-linux:
         extra: libsdl2-dev libglfw3-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
+    # In this case it gets stuck even with 24 jobs. Only on GCC, usually when
+    # the huge TradeAbstractImporterTest / TradeMaterialDataTest get involved.
+    # TODO: revisit when we get rid of more STL / deprecated includes
+    - cap-ninja-jobs:
+        count: 20
     - install-gcc-4_8
     - install-cmake:
         version: "3.4.3"
@@ -385,7 +385,7 @@ jobs:
     - install-base-linux:
         extra: libgl1-mesa-dev libsdl2-dev libglfw3-dev libopenal-dev libvulkan-dev
     # 24 is not enough, unlike the other GCC-based builds
-    # TODO: revisit when we get rid of more STL
+    # TODO: revisit when we get rid of more STL / deprecated includes
     - cap-ninja-jobs:
         count: 20
     - install-gcc-4_8