diff --git a/docker.sh b/docker.sh
index 7d9504c6..84e06dac 100755
--- a/docker.sh
+++ b/docker.sh
@@ -14,6 +14,7 @@ IMAGES="${DH_PROJECT}-full ${DH_PROJECT}"
 ALL_ARCHS="x86_64 armv7l aarch64"
 TAG=${TAG:-"latest"}
 ARCHTAG="${TAG}-${ARCH}"
+MAKEFLAGS="${MAKEFLAGS:-"-j4"}"
 
 usage () {
   echo "Usage: ${0} [command]"
@@ -30,11 +31,11 @@ usage () {
 buildn () {
   # build the base images
   echo -ne "\n\nBuilding the base image.\n\n"
-  time docker build --pull -t ${DH_PROJECT}-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-base .
+  time docker build --pull --build-arg MAKEFLAGS=${MAKEFLAGS} -t ${DH_PROJECT}-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-base .
 
   # AF: uncomment next 2 lines if you're building all images
   #echo -ne "\n\nBuilding soapysdr image.\n\n"
-  #docker build --build-arg ARCHTAG=${ARCHTAG} --build-arg PROJECT=${DH_PROJECT} -t ${DH_PROJECT}-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
+  #docker build --build-arg ARCHTAG=${ARCHTAG} --build-arg PROJECT=${DH_PROJECT} --build-arg MAKEFLAGS=${MAKEFLAGS} -t ${DH_PROJECT}-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
 
   GIT_HASH=$(git rev-parse --short master)
   for image in ${IMAGES}; do
@@ -42,7 +43,7 @@ buildn () {
     # "openwebrx" is a special image that gets tag-aliased later on
     if [[ ! -z "${i}" && "${i}" != "${DH_PROJECT}" ]] ; then
       echo -ne "\n\nBuilding ${i} image.\n\n"
-      docker build --build-arg GIT_HASH=${GIT_HASH} --build-arg ARCHTAG=$ARCHTAG --build-arg PROJECT=${DH_PROJECT} -t ${DH_USERNAME}/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
+      docker build --build-arg GIT_HASH=${GIT_HASH} --build-arg ARCHTAG=$ARCHTAG --build-arg PROJECT=${DH_PROJECT} --build-arg MAKEFLAGS=${MAKEFLAGS} -t ${DH_USERNAME}/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
     fi
   done
 
@@ -71,7 +72,7 @@ buildr () {
   fi
 
   echo -ne "\n\nBuilding release image: $1.\n\n"
-	docker build --pull --build-arg VERSION=$1 -t ${DH_USERNAME}/${DH_PROJECT}:${1} -f docker/deb_based/Dockerfile .
+	docker build --pull --build-arg VERSION=$1 --build-arg MAKEFLAGS=${MAKEFLAGS} -t ${DH_USERNAME}/${DH_PROJECT}:${1} -f docker/deb_based/Dockerfile .
 
   docker tag ${DH_USERNAME}/${DH_PROJECT}:${1} ${DH_USERNAME}/${DH_PROJECT}
 }
diff --git a/docker/Dockerfiles/Dockerfile-airspy b/docker/Dockerfiles/Dockerfile-airspy
index e22aec04..63edfc11 100644
--- a/docker/Dockerfiles/Dockerfile-airspy
+++ b/docker/Dockerfiles/Dockerfile-airspy
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-airspy.sh /
diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 06380316..573940bf 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,3 +1,4 @@
+ARG MAKEFLAGS
 FROM debian:bullseye-slim
 
 COPY docker/files/js8call/js8call-hamlib.patch \
diff --git a/docker/Dockerfiles/Dockerfile-bladerf b/docker/Dockerfiles/Dockerfile-bladerf
index 73504009..a34d9039 100644
--- a/docker/Dockerfiles/Dockerfile-bladerf
+++ b/docker/Dockerfiles/Dockerfile-bladerf
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-bladerf.sh /
diff --git a/docker/Dockerfiles/Dockerfile-fcdpp b/docker/Dockerfiles/Dockerfile-fcdpp
index d9d01953..6920a007 100644
--- a/docker/Dockerfiles/Dockerfile-fcdpp
+++ b/docker/Dockerfiles/Dockerfile-fcdpp
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-fcdpp.sh /
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index d6797bd4..8efae6ef 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
 
 COPY docker/scripts/install-*.sh \
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index 81a0fb60..b5317d18 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-hackrf.sh /
diff --git a/docker/Dockerfiles/Dockerfile-hpsdr b/docker/Dockerfiles/Dockerfile-hpsdr
index 808d9fe8..5cf8f68b 100644
--- a/docker/Dockerfiles/Dockerfile-hpsdr
+++ b/docker/Dockerfiles/Dockerfile-hpsdr
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-hpsdr.sh /
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
index 5a46b38a..d3502ca0 100644
--- a/docker/Dockerfiles/Dockerfile-limesdr
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-limesdr.sh /
diff --git a/docker/Dockerfiles/Dockerfile-perseus b/docker/Dockerfiles/Dockerfile-perseus
index d52599ea..aad26766 100644
--- a/docker/Dockerfiles/Dockerfile-perseus
+++ b/docker/Dockerfiles/Dockerfile-perseus
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-perseus.sh /
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
index 47bc37ba..76b91e67 100644
--- a/docker/Dockerfiles/Dockerfile-plutosdr
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-plutosdr.sh /
diff --git a/docker/Dockerfiles/Dockerfile-radioberry b/docker/Dockerfiles/Dockerfile-radioberry
index 8b0fa983..940ac0ad 100644
--- a/docker/Dockerfiles/Dockerfile-radioberry
+++ b/docker/Dockerfiles/Dockerfile-radioberry
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-radioberry.sh /
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr b/docker/Dockerfiles/Dockerfile-rtlsdr
index 9b6c0d72..0b2ae13b 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-rtlsdr.sh \
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
index 00f7fd6e..409352f9 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-rtlsdr-soapy.sh /
diff --git a/docker/Dockerfiles/Dockerfile-rtltcp b/docker/Dockerfiles/Dockerfile-rtltcp
index 4d01294d..e60074a1 100644
--- a/docker/Dockerfiles/Dockerfile-rtltcp
+++ b/docker/Dockerfiles/Dockerfile-rtltcp
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
 
 COPY docker/scripts/install-connectors.sh /
diff --git a/docker/Dockerfiles/Dockerfile-runds b/docker/Dockerfiles/Dockerfile-runds
index 17431753..cbd93ea0 100644
--- a/docker/Dockerfiles/Dockerfile-runds
+++ b/docker/Dockerfiles/Dockerfile-runds
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
 
 COPY docker/scripts/install-connectors.sh \
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index 10c3905f..b256546a 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-sdrplay.sh \
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
index fce2b0fd..753df29a 100644
--- a/docker/Dockerfiles/Dockerfile-soapyremote
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-soapyremote.sh /
diff --git a/docker/Dockerfiles/Dockerfile-soapysdr b/docker/Dockerfiles/Dockerfile-soapysdr
index 9937fd8b..4382978b 100644
--- a/docker/Dockerfiles/Dockerfile-soapysdr
+++ b/docker/Dockerfiles/Dockerfile-soapysdr
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-soapysdr.sh \
diff --git a/docker/Dockerfiles/Dockerfile-uhd b/docker/Dockerfiles/Dockerfile-uhd
index a05cc259..92063d0f 100644
--- a/docker/Dockerfiles/Dockerfile-uhd
+++ b/docker/Dockerfiles/Dockerfile-uhd
@@ -1,5 +1,6 @@
 ARG ARCHTAG
 ARG PROJECT
+ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
 
 COPY docker/scripts/install-dependencies-uhd.sh /
diff --git a/docker/scripts/add-dependencies.sh b/docker/scripts/add-dependencies.sh
index 1c516f91..8e3cde45 100755
--- a/docker/scripts/add-dependencies.sh
+++ b/docker/scripts/add-dependencies.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/add-owrx-tools.sh b/docker/scripts/add-owrx-tools.sh
index 41131670..02fa1c98 100755
--- a/docker/scripts/add-owrx-tools.sh
+++ b/docker/scripts/add-owrx-tools.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-010-dependencies-rtlsdr.sh b/docker/scripts/install-010-dependencies-rtlsdr.sh
index 3508192a..ea93ea44 100755
--- a/docker/scripts/install-010-dependencies-rtlsdr.sh
+++ b/docker/scripts/install-010-dependencies-rtlsdr.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-020-dependencies-soapysdr.sh b/docker/scripts/install-020-dependencies-soapysdr.sh
index 808400c3..6a25de44 100755
--- a/docker/scripts/install-020-dependencies-soapysdr.sh
+++ b/docker/scripts/install-020-dependencies-soapysdr.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-030-dependencies-hackrf.sh b/docker/scripts/install-030-dependencies-hackrf.sh
index 8ca44e9d..b238d749 100755
--- a/docker/scripts/install-030-dependencies-hackrf.sh
+++ b/docker/scripts/install-030-dependencies-hackrf.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-040-dependencies-sdrplay.sh b/docker/scripts/install-040-dependencies-sdrplay.sh
index b4b84bcc..79da7f92 100755
--- a/docker/scripts/install-040-dependencies-sdrplay.sh
+++ b/docker/scripts/install-040-dependencies-sdrplay.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-050-dependencies-airspy.sh b/docker/scripts/install-050-dependencies-airspy.sh
index 3dc5b8e5..1d59383f 100755
--- a/docker/scripts/install-050-dependencies-airspy.sh
+++ b/docker/scripts/install-050-dependencies-airspy.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-060-dependencies-rtlsdr-soapy.sh b/docker/scripts/install-060-dependencies-rtlsdr-soapy.sh
index d381b6ec..cc44e75b 100755
--- a/docker/scripts/install-060-dependencies-rtlsdr-soapy.sh
+++ b/docker/scripts/install-060-dependencies-rtlsdr-soapy.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-070-dependencies-plutosdr.sh b/docker/scripts/install-070-dependencies-plutosdr.sh
index 3e3ed1d9..64f55e77 100755
--- a/docker/scripts/install-070-dependencies-plutosdr.sh
+++ b/docker/scripts/install-070-dependencies-plutosdr.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-080-dependencies-limesdr.sh b/docker/scripts/install-080-dependencies-limesdr.sh
index f291e45e..8481ce93 100755
--- a/docker/scripts/install-080-dependencies-limesdr.sh
+++ b/docker/scripts/install-080-dependencies-limesdr.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 cd /tmp
 
diff --git a/docker/scripts/install-090-dependencies-soapyremote.sh b/docker/scripts/install-090-dependencies-soapyremote.sh
index e356974f..19fea182 100755
--- a/docker/scripts/install-090-dependencies-soapyremote.sh
+++ b/docker/scripts/install-090-dependencies-soapyremote.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-100-dependencies-perseus.sh b/docker/scripts/install-100-dependencies-perseus.sh
index c9826e2c..c5c1f7c9 100755
--- a/docker/scripts/install-100-dependencies-perseus.sh
+++ b/docker/scripts/install-100-dependencies-perseus.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 cd /tmp
 
diff --git a/docker/scripts/install-110-dependencies-fcdpp.sh b/docker/scripts/install-110-dependencies-fcdpp.sh
index d7c9aa48..a1516824 100755
--- a/docker/scripts/install-110-dependencies-fcdpp.sh
+++ b/docker/scripts/install-110-dependencies-fcdpp.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-120-dependencies-radioberry.sh b/docker/scripts/install-120-dependencies-radioberry.sh
index fe96f2f1..e00a3af7 100755
--- a/docker/scripts/install-120-dependencies-radioberry.sh
+++ b/docker/scripts/install-120-dependencies-radioberry.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-130-dependencies-uhd.sh b/docker/scripts/install-130-dependencies-uhd.sh
index 681a6473..df2f181f 100755
--- a/docker/scripts/install-130-dependencies-uhd.sh
+++ b/docker/scripts/install-130-dependencies-uhd.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-140-dependencies-hpsdr.sh b/docker/scripts/install-140-dependencies-hpsdr.sh
index a4a945b2..cec1cd42 100755
--- a/docker/scripts/install-140-dependencies-hpsdr.sh
+++ b/docker/scripts/install-140-dependencies-hpsdr.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 BUILD_PACKAGES="git wget gcc libc6-dev"
 
diff --git a/docker/scripts/install-150-dependencies-bladerf.sh b/docker/scripts/install-150-dependencies-bladerf.sh
index b696b77e..cb0a5e23 100755
--- a/docker/scripts/install-150-dependencies-bladerf.sh
+++ b/docker/scripts/install-150-dependencies-bladerf.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-500-connectors.sh b/docker/scripts/install-500-connectors.sh
index 2c807e06..a04a34ed 100755
--- a/docker/scripts/install-500-connectors.sh
+++ b/docker/scripts/install-500-connectors.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-510-dependencies-runds.sh b/docker/scripts/install-510-dependencies-runds.sh
index d6d34db2..cba0784e 100755
--- a/docker/scripts/install-510-dependencies-runds.sh
+++ b/docker/scripts/install-510-dependencies-runds.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1