diff --git a/docker.sh b/docker.sh
index 84e06dac..62513f1a 100755
--- a/docker.sh
+++ b/docker.sh
@@ -31,11 +31,11 @@ usage () {
 buildn () {
   # build the base images
   echo -ne "\n\nBuilding the base image.\n\n"
-  time docker build --pull --build-arg MAKEFLAGS=${MAKEFLAGS} -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} --build-arg MAKEFLAGS=${MAKEFLAGS} -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
@@ -43,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} --build-arg MAKEFLAGS=${MAKEFLAGS} -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
 
@@ -72,7 +72,7 @@ buildr () {
   fi
 
   echo -ne "\n\nBuilding release image: $1.\n\n"
-	docker build --pull --build-arg VERSION=$1 --build-arg MAKEFLAGS=${MAKEFLAGS} -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 63edfc11..e8bf739d 100644
--- a/docker/Dockerfiles/Dockerfile-airspy
+++ b/docker/Dockerfiles/Dockerfile-airspy
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-airspy.sh /
 RUN /install-dependencies-airspy.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 573940bf..8fe954ab 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,5 +1,5 @@
-ARG MAKEFLAGS
 FROM debian:bullseye-slim
+ARG MAKEFLAGS
 
 COPY docker/files/js8call/js8call-hamlib.patch \
      docker/files/wsjtx/wsjtx.patch \
diff --git a/docker/Dockerfiles/Dockerfile-bladerf b/docker/Dockerfiles/Dockerfile-bladerf
index a34d9039..7983553d 100644
--- a/docker/Dockerfiles/Dockerfile-bladerf
+++ b/docker/Dockerfiles/Dockerfile-bladerf
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-bladerf.sh /
 RUN /install-dependencies-bladerf.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-fcdpp b/docker/Dockerfiles/Dockerfile-fcdpp
index 6920a007..32418c8b 100644
--- a/docker/Dockerfiles/Dockerfile-fcdpp
+++ b/docker/Dockerfiles/Dockerfile-fcdpp
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-fcdpp.sh /
 RUN /install-dependencies-fcdpp.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 8efae6ef..b8f5971f 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-*.sh \
      docker/files/sdrplay/install-lib.*.patch /
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index b5317d18..ea1c47cf 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -2,6 +2,7 @@ ARG ARCHTAG
 ARG PROJECT
 ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-hackrf.sh /
 RUN /install-dependencies-hackrf.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-hpsdr b/docker/Dockerfiles/Dockerfile-hpsdr
index 5cf8f68b..8b7de571 100644
--- a/docker/Dockerfiles/Dockerfile-hpsdr
+++ b/docker/Dockerfiles/Dockerfile-hpsdr
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-hpsdr.sh /
 
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
index d3502ca0..ed9971d5 100644
--- a/docker/Dockerfiles/Dockerfile-limesdr
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-limesdr.sh /
 RUN /install-dependencies-limesdr.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-perseus b/docker/Dockerfiles/Dockerfile-perseus
index aad26766..924b0041 100644
--- a/docker/Dockerfiles/Dockerfile-perseus
+++ b/docker/Dockerfiles/Dockerfile-perseus
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-perseus.sh /
 RUN /install-dependencies-perseus.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
index 76b91e67..6f2c633c 100644
--- a/docker/Dockerfiles/Dockerfile-plutosdr
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-plutosdr.sh /
 RUN /install-dependencies-plutosdr.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-radioberry b/docker/Dockerfiles/Dockerfile-radioberry
index 940ac0ad..34aedf0a 100644
--- a/docker/Dockerfiles/Dockerfile-radioberry
+++ b/docker/Dockerfiles/Dockerfile-radioberry
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-radioberry.sh /
 RUN /install-dependencies-radioberry.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr b/docker/Dockerfiles/Dockerfile-rtlsdr
index 0b2ae13b..f8abc997 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-rtlsdr.sh \
      docker/scripts/install-connectors.sh /
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
index 409352f9..a347cf73 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-rtlsdr-soapy.sh /
 RUN /install-dependencies-rtlsdr-soapy.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-rtltcp b/docker/Dockerfiles/Dockerfile-rtltcp
index e60074a1..85b18f1b 100644
--- a/docker/Dockerfiles/Dockerfile-rtltcp
+++ b/docker/Dockerfiles/Dockerfile-rtltcp
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-connectors.sh /
 
diff --git a/docker/Dockerfiles/Dockerfile-runds b/docker/Dockerfiles/Dockerfile-runds
index cbd93ea0..1c389ee2 100644
--- a/docker/Dockerfiles/Dockerfile-runds
+++ b/docker/Dockerfiles/Dockerfile-runds
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-connectors.sh \
      docker/scripts/install-dependencies-runds.sh /
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index b256546a..51e0e270 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-sdrplay.sh \
      docker/files/sdrplay/install-lib.*.patch /
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
index 753df29a..10d8aa02 100644
--- a/docker/Dockerfiles/Dockerfile-soapyremote
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-soapyremote.sh /
 RUN /install-dependencies-soapyremote.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-soapysdr b/docker/Dockerfiles/Dockerfile-soapysdr
index 4382978b..7cfbc1d7 100644
--- a/docker/Dockerfiles/Dockerfile-soapysdr
+++ b/docker/Dockerfiles/Dockerfile-soapysdr
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-soapysdr.sh \
      docker/scripts/install-connectors.sh /
diff --git a/docker/Dockerfiles/Dockerfile-uhd b/docker/Dockerfiles/Dockerfile-uhd
index 92063d0f..aafd5c13 100644
--- a/docker/Dockerfiles/Dockerfile-uhd
+++ b/docker/Dockerfiles/Dockerfile-uhd
@@ -1,7 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
-ARG MAKEFLAGS
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-uhd.sh /
 RUN /install-dependencies-uhd.sh &&\