diff --git a/programs/build_helpers/build_and_test b/programs/build_helpers/build_and_test
index 062f4d1883..ac1eea47f0 100755
--- a/programs/build_helpers/build_and_test
+++ b/programs/build_helpers/build_and_test
@@ -10,7 +10,7 @@ set -o pipefail
 programs/build_helpers/buildstep run.chain_test 240 "libraries/fc/tests/run-parallel-tests.sh tests/chain_test"
 programs/build_helpers/buildstep run.cli_test 60 "libraries/fc/tests/run-parallel-tests.sh tests/cli_test"
 programs/build_helpers/buildstep prepare.sonar 20 "find libraries/[acdenptuw]*/CMakeFiles/*.dir programs/[cdgjsw]*/CMakeFiles/*.dir -type d -print | while read d; do gcov -o \"\$d\" \"\${d/CMakeFiles*.dir//}\"/*.cpp; done >/dev/null; programs/build_helpers/set_sonar_branch sonar-project.properties" || true
-programs/build_helpers/buildstep run.sonar 1200 "which sonar-scanner && sonar-scanner" || true
+programs/build_helpers/buildstep run.sonar 1500 "which sonar-scanner && sonar-scanner" || true
 programs/build_helpers/buildstep end 0
 ccache -s
 
diff --git a/programs/build_helpers/build_protocol b/programs/build_helpers/build_protocol
index 9eb783cf37..f37a2326b2 100755
--- a/programs/build_helpers/build_protocol
+++ b/programs/build_helpers/build_protocol
@@ -5,7 +5,12 @@ programs/build_helpers/buildstep -s 3500
 ccache -s
 programs/build_helpers/buildstep Prepare 1 "sed -i '/tests/d' libraries/fc/CMakeLists.txt"
 programs/build_helpers/buildstep cmake 5 "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON ."
-programs/build_helpers/buildstep make.fc 200 "make -j 2 fc"
-programs/build_helpers/buildstep make.custom_auths 1000 "make -j 2 graphene_protocol"
+programs/build_helpers/buildstep make.fc 230 "make -j 2 fc"
+programs/build_helpers/buildstep make.protocol 250 "make -j 2 graphene_protocol"
+programs/build_helpers/buildstep make.chain 450 "make -j 2 graphene_chain"
+programs/build_helpers/buildstep make.node 450 "make -j 2 witness_node"
+programs/build_helpers/buildstep make.cli 450 "make -j 2 cli_wallet"
+programs/build_helpers/buildstep make.cli_test 450 "make -j 2 cli_test"
+programs/build_helpers/buildstep make.chain_test 450 "make -j 2 chain_test"
 programs/build_helpers/buildstep end 0
 ccache -s