diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index fbb3bd7..af5007f 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -5,8 +5,8 @@ ADD docker/scripts/install-dependencies-*.sh /
 ADD docker/files/sdrplay/install-lib.*.patch /
 
 RUN /install-dependencies-rtlsdr.sh &&\
-    /install-dependencies-hackrf.sh &&\
     /install-dependencies-soapysdr.sh &&\
+    /install-dependencies-hackrf.sh &&\
     /install-dependencies-sdrplay.sh &&\
     /install-dependencies-airspy.sh &&\
     /install-dependencies-rtlsdr-soapy.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index 6d5d5e8..93cb35b 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -1,5 +1,5 @@
 ARG ARCHTAG
-FROM openwebrx-base:$ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-hackrf.sh /
 RUN /install-dependencies-hackrf.sh &&\
diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh
index 9c6d47b..d01d009 100755
--- a/docker/scripts/install-dependencies-hackrf.sh
+++ b/docker/scripts/install-dependencies-hackrf.sh
@@ -31,6 +31,9 @@ cmakebuild host
 cd ..
 rm -rf hackrf
 
+git clone https://github.com/pothosware/SoapyHackRF.git
+cmakebuild SoapyHackRF 3c514cecd3dd2fdf4794aebc96c482940c11d7ff
+
 SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean
 rm -rf /var/lib/apt/lists/*