diff --git a/.github/workflows/build-and-test.mac.yml b/.github/workflows/build-and-test.mac.yml
index edc02f659..de5dcd5e8 100644
--- a/.github/workflows/build-and-test.mac.yml
+++ b/.github/workflows/build-and-test.mac.yml
@@ -42,7 +42,7 @@ jobs:
       run: |
         export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
         mkdir -p "$CCACHE_DIR"
-        make -j 2 -C _build witness_node cli_wallet app_test cli_test chain_test
+        make -j 3 -C _build witness_node cli_wallet app_test cli_test chain_test
         df -h
     - name: Unit-Tests
       run: |
diff --git a/.github/workflows/build-and-test.ubuntu-debug.yml b/.github/workflows/build-and-test.ubuntu-debug.yml
index 0157b871c..b361866f8 100644
--- a/.github/workflows/build-and-test.ubuntu-debug.yml
+++ b/.github/workflows/build-and-test.ubuntu-debug.yml
@@ -14,6 +14,7 @@ jobs:
       elasticsearch8:
         image: elastic/elasticsearch:8.5.3
         options: >-
+          --env ES_JAVA_OPTS="-Xms512m -Xmx512m"
           --env discovery.type=single-node
           --env xpack.security.enabled=false
           --env xpack.security.http.ssl.enabled=false
@@ -23,6 +24,7 @@ jobs:
       elasticsearch7:
         image: elastic/elasticsearch:7.17.8
         options: >-
+          --env ES_JAVA_OPTS="-Xms512m -Xmx512m"
           --env discovery.type=single-node
           --env cluster.routing.allocation.disk.threshold_enabled=false
           --publish 9201:9200
@@ -63,11 +65,6 @@ jobs:
         pwd
         df -h .
         free
-        sudo dd if=/dev/zero of=/swapfile bs=1024 count=4M
-        sudo chmod 600 /swapfile
-        sudo mkswap /swapfile
-        sudo swapon /swapfile
-        free
         mkdir -p _build
         sudo mkdir -p /_build/libraries /_build/programs /_build/tests /mnt/_build
         sudo chmod a+rwx /_build/libraries /_build/programs /_build/tests
@@ -101,13 +98,13 @@ jobs:
         export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
         mkdir -p "$CCACHE_DIR"
         df -h
-        make -j 1 -C _build chain_test
-        make -j 1 -C _build cli_test
-        make -j 1 -C _build app_test
-        make -j 1 -C _build es_test
-        make -j 1 -C _build cli_wallet
-        make -j 1 -C _build witness_node
-        make -j 1 -C _build
+        make -j 2 -C _build chain_test
+        make -j 2 -C _build cli_test
+        make -j 2 -C _build app_test
+        make -j 2 -C _build es_test
+        make -j 2 -C _build cli_wallet
+        make -j 2 -C _build witness_node
+        make -j 2 -C _build
         df -h
         du -hs _build/libraries/* _build/programs/* _build/tests/*
         du -hs _build/*
diff --git a/.github/workflows/build-and-test.ubuntu-release.yml b/.github/workflows/build-and-test.ubuntu-release.yml
index 98e72a201..1976ce317 100644
--- a/.github/workflows/build-and-test.ubuntu-release.yml
+++ b/.github/workflows/build-and-test.ubuntu-release.yml
@@ -14,6 +14,7 @@ jobs:
       elasticsearch8:
         image: elastic/elasticsearch:8.5.3
         options: >-
+          --env ES_JAVA_OPTS="-Xms512m -Xmx512m"
           --env discovery.type=single-node
           --env xpack.security.enabled=false
           --env xpack.security.http.ssl.enabled=false
@@ -23,6 +24,7 @@ jobs:
       elasticsearch7:
         image: elastic/elasticsearch:7.17.8
         options: >-
+          --env ES_JAVA_OPTS="-Xms512m -Xmx512m"
           --env discovery.type=single-node
           --env cluster.routing.allocation.disk.threshold_enabled=false
           --publish 9201:9200
@@ -57,6 +59,8 @@ jobs:
         submodules: recursive
     - name: Configure
       run: |
+        df -h
+        free
         mkdir -p _build
         pushd _build
         export -n BOOST_ROOT BOOST_INCLUDEDIR BOOST_LIBRARYDIR
@@ -80,7 +84,7 @@ jobs:
       run: |
         export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
         mkdir -p "$CCACHE_DIR"
-        make -j 1 -C _build
+        make -j 2 -C _build
         df -h
     - name: Unit-Tests
       run: |
diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
index eb8ad9f34..0118fef10 100644
--- a/.github/workflows/sonar-scan.yml
+++ b/.github/workflows/sonar-scan.yml
@@ -14,6 +14,7 @@ jobs:
       elasticsearch8:
         image: elastic/elasticsearch:8.5.3
         options: >-
+          --env ES_JAVA_OPTS="-Xms512m -Xmx512m"
           --env discovery.type=single-node
           --env xpack.security.enabled=false
           --env xpack.security.http.ssl.enabled=false
@@ -76,11 +77,6 @@ jobs:
         pwd
         df -h .
         free
-        sudo dd if=/dev/zero of=/swapfile bs=1024 count=4M
-        sudo chmod 600 /swapfile
-        sudo mkswap /swapfile
-        sudo swapon /swapfile
-        free
         mkdir -p _build
         sudo mkdir -p /_build/libraries /_build/programs /mnt/_build/tests
         sudo chmod a+rwx /_build/libraries /_build/programs /mnt/_build/tests
@@ -123,7 +119,7 @@ jobs:
         export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
         mkdir -p "$CCACHE_DIR"
         df -h
-        programs/build_helpers/make_with_sonar bw-output -j 1 -C _build \
+        programs/build_helpers/make_with_sonar bw-output -j 2 -C _build \
           witness_node cli_wallet js_operation_serializer get_dev_key network_mapper \
           app_test chain_test cli_test es_test
         df -h