diff --git a/docker/Dockerfiles/Dockerfile-airspy b/docker/Dockerfiles/Dockerfile-airspy
index 16328707..88b4e110 100644
--- a/docker/Dockerfiles/Dockerfile-airspy
+++ b/docker/Dockerfiles/Dockerfile-airspy
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-airspy.sh /
-RUN /install-dependencies-airspy.sh
-RUN rm /install-dependencies-airspy.sh
+RUN /install-dependencies-airspy.sh &&\
+    rm /install-dependencies-airspy.sh
diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 566f9d13..56abb80f 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -6,8 +6,8 @@ RUN ln -s /usr/local/lib /usr/local/lib64
 
 ADD docker/scripts/direwolf-1.5.patch /
 ADD docker/scripts/install-dependencies.sh /
-RUN /install-dependencies.sh
-RUN rm /install-dependencies.sh
+RUN /install-dependencies.sh && \
+    rm /install-dependencies.sh
 
 ADD . /opt/openwebrx
 
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 992fa8e9..b38511c7 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -4,17 +4,18 @@ FROM openwebrx-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-*.sh /
 ADD docker/scripts/install-lib.*.patch /
 
-RUN /install-dependencies-rtlsdr.sh
-RUN /install-dependencies-hackrf.sh
-RUN /install-dependencies-soapysdr.sh
-RUN /install-dependencies-sdrplay.sh
-RUN /install-dependencies-airspy.sh
-RUN /install-dependencies-rtlsdr-soapy.sh
-RUN /install-dependencies-plutosdr.sh
-RUN /install-dependencies-limesdr.sh
-RUN /install-dependencies-soapyremote.sh
-RUN rm /install-dependencies-*.sh
+RUN /install-dependencies-rtlsdr.sh &&\
+    /install-dependencies-hackrf.sh &&\
+    /install-dependencies-soapysdr.sh &&\
+    /install-dependencies-sdrplay.sh &&\
+    /install-dependencies-airspy.sh &&\
+    /install-dependencies-rtlsdr-soapy.sh &&\
+    /install-dependencies-plutosdr.sh &&\
+    /install-dependencies-limesdr.sh &&\
+    /install-dependencies-soapyremote.sh &&\
+    rm /install-dependencies-*.sh &&\
+    rm /install-libp.*.patch
 
 ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
+RUN /install-connectors.sh &&\
+    rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index 57643ab4..8b264996 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -2,6 +2,6 @@ ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-hackrf.sh /
-RUN /install-dependencies-hackrf.sh
-RUN rm /install-dependencies-hackrf.sh
+RUN /install-dependencies-hackrf.sh &&\
+    rm /install-dependencies-hackrf.sh
 
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
index 9a224288..ea7a0502 100644
--- a/docker/Dockerfiles/Dockerfile-limesdr
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-limesdr.sh /
-RUN /install-dependencies-limesdr.sh
-RUN rm /install-dependencies-limesdr.sh
+RUN /install-dependencies-limesdr.sh &&\
+    rm /install-dependencies-limesdr.sh
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
index 5a1aeef6..c0879602 100644
--- a/docker/Dockerfiles/Dockerfile-plutosdr
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-plutosdr.sh /
-RUN /install-dependencies-plutosdr.sh
-RUN rm /install-dependencies-plutosdr.sh
+RUN /install-dependencies-plutosdr.sh &&\
+    rm /install-dependencies-plutosdr.sh
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr b/docker/Dockerfiles/Dockerfile-rtlsdr
index b0726dad..d6373930 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr
@@ -2,9 +2,9 @@ ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-rtlsdr.sh /
-RUN /install-dependencies-rtlsdr.sh
-RUN rm /install-dependencies-rtlsdr.sh
-
 ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
+
+RUN /install-dependencies-rtlsdr.sh &&\
+    rm /install-dependencies-rtlsdr.sh &&\
+    /install-connectors.sh &&\
+    rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
index 75a5daa7..aeb4ef5e 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh /
-RUN /install-dependencies-rtlsdr-soapy.sh
-RUN rm /install-dependencies-rtlsdr-soapy.sh
+RUN /install-dependencies-rtlsdr-soapy.sh &&\
+    rm /install-dependencies-rtlsdr-soapy.sh
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index 9083a07a..943fb2b9 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -3,6 +3,6 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-sdrplay.sh /
 ADD docker/scripts/install-lib.*.patch /
-RUN /install-dependencies-sdrplay.sh
-RUN rm /install-dependencies-sdrplay.sh
-RUN rm /install-lib.*.patch
+RUN /install-dependencies-sdrplay.sh &&\
+    rm /install-dependencies-sdrplay.sh &&\
+    rm /install-lib.*.patch
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
index 1c569061..3eef82bc 100644
--- a/docker/Dockerfiles/Dockerfile-soapyremote
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-soapyremote.sh /
-RUN /install-dependencies-soapyremote.sh
-RUN rm /install-dependencies-soapyremote.sh
+RUN /install-dependencies-soapyremote.sh &&\
+    rm /install-dependencies-soapyremote.sh
diff --git a/docker/Dockerfiles/Dockerfile-soapysdr b/docker/Dockerfiles/Dockerfile-soapysdr
index 8cfdaebe..c3f8626a 100644
--- a/docker/Dockerfiles/Dockerfile-soapysdr
+++ b/docker/Dockerfiles/Dockerfile-soapysdr
@@ -2,9 +2,8 @@ ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-soapysdr.sh /
-RUN /install-dependencies-soapysdr.sh
-RUN rm /install-dependencies-soapysdr.sh
-
 ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
+RUN /install-dependencies-soapysdr.sh &&\
+    rm /install-dependencies-soapysdr.sh &&\
+    /install-connectors.sh &&\
+    rm /install-connectors.sh