diff --git a/builder/stage4/06-pisdr-gnuradio/00-run.sh b/builder/stage4/06-pisdr-gnuradio/00-run.sh
index e32df0a..de41918 100755
--- a/builder/stage4/06-pisdr-gnuradio/00-run.sh
+++ b/builder/stage4/06-pisdr-gnuradio/00-run.sh
@@ -13,8 +13,8 @@ git checkout maint-3.8
 git submodule update --init --recursive
 mkdir -p build
 cd build
-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 ../
-ninja
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 ..
+ninja install
 ldconfig
 EOF
 
diff --git a/builder/stage4/23-pisdr-soapysdr/00-packages-nr b/builder/stage4/07-pisdr-soapysdr/00-packages-nr
similarity index 100%
rename from builder/stage4/23-pisdr-soapysdr/00-packages-nr
rename to builder/stage4/07-pisdr-soapysdr/00-packages-nr
diff --git a/builder/stage4/23-pisdr-soapysdr/01-run.sh b/builder/stage4/07-pisdr-soapysdr/01-run.sh
similarity index 100%
rename from builder/stage4/23-pisdr-soapysdr/01-run.sh
rename to builder/stage4/07-pisdr-soapysdr/01-run.sh
diff --git a/builder/stage4/23-pisdr-soapysdr/02-run.sh b/builder/stage4/07-pisdr-soapysdr/02-run.sh
similarity index 100%
rename from builder/stage4/23-pisdr-soapysdr/02-run.sh
rename to builder/stage4/07-pisdr-soapysdr/02-run.sh
diff --git a/builder/stage4/23-pisdr-soapysdr/03-run.sh b/builder/stage4/07-pisdr-soapysdr/03-run.sh
similarity index 100%
rename from builder/stage4/23-pisdr-soapysdr/03-run.sh
rename to builder/stage4/07-pisdr-soapysdr/03-run.sh
diff --git a/builder/stage4/07-pisdr-limesdr/00-packages-nr b/builder/stage4/08-pisdr-limesdr/00-packages-nr
similarity index 100%
rename from builder/stage4/07-pisdr-limesdr/00-packages-nr
rename to builder/stage4/08-pisdr-limesdr/00-packages-nr
diff --git a/builder/stage4/07-pisdr-limesdr/00-run.sh b/builder/stage4/08-pisdr-limesdr/00-run.sh
similarity index 83%
rename from builder/stage4/07-pisdr-limesdr/00-run.sh
rename to builder/stage4/08-pisdr-limesdr/00-run.sh
index d23cb80..e202f08 100755
--- a/builder/stage4/07-pisdr-limesdr/00-run.sh
+++ b/builder/stage4/08-pisdr-limesdr/00-run.sh
@@ -11,8 +11,8 @@ fi
 cd LimeSuite
 mkdir -p build
 cd build
-cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ../
-ninja
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
 ldconfig
 
 cd ../udev-rules
diff --git a/builder/stage4/07-pisdr-limesdr/01-run.sh b/builder/stage4/08-pisdr-limesdr/01-run.sh
similarity index 83%
rename from builder/stage4/07-pisdr-limesdr/01-run.sh
rename to builder/stage4/08-pisdr-limesdr/01-run.sh
index baba46a..cf2829a 100755
--- a/builder/stage4/07-pisdr-limesdr/01-run.sh
+++ b/builder/stage4/08-pisdr-limesdr/01-run.sh
@@ -12,7 +12,7 @@ cd gr-limesdr
 git checkout gr-3.8
 mkdir -p build
 cd build
-cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ../
-ninja
+cmake -GNinja -DCMAKE_CXX_FLAGS=-latomic ..
+ninja install
 ldconfig
 EOF
diff --git a/builder/stage4/08-pisdr-airspy/00-run.sh b/builder/stage4/09-pisdr-airspy/00-run.sh
similarity index 95%
rename from builder/stage4/08-pisdr-airspy/00-run.sh
rename to builder/stage4/09-pisdr-airspy/00-run.sh
index 64350dc..c76c6da 100755
--- a/builder/stage4/08-pisdr-airspy/00-run.sh
+++ b/builder/stage4/09-pisdr-airspy/00-run.sh
@@ -12,6 +12,6 @@ cd airspyone_host
 mkdir -p build
 cd build
 cmake -GNinja -DINSTALL_UDEV_RULES=ON ..
-ninja
+ninja install
 ldconfig
 EOF
\ No newline at end of file
diff --git a/builder/stage4/08-pisdr-airspy/01-run.sh b/builder/stage4/09-pisdr-airspy/01-run.sh
similarity index 100%
rename from builder/stage4/08-pisdr-airspy/01-run.sh
rename to builder/stage4/09-pisdr-airspy/01-run.sh
diff --git a/builder/stage4/08-pisdr-airspy/02-run.sh b/builder/stage4/09-pisdr-airspy/02-run.sh
similarity index 100%
rename from builder/stage4/08-pisdr-airspy/02-run.sh
rename to builder/stage4/09-pisdr-airspy/02-run.sh
diff --git a/builder/stage4/08-pisdr-airspy/03-run.sh b/builder/stage4/09-pisdr-airspy/03-run.sh
similarity index 100%
rename from builder/stage4/08-pisdr-airspy/03-run.sh
rename to builder/stage4/09-pisdr-airspy/03-run.sh
diff --git a/builder/stage4/09-pisdr-rtlsdr/00-run.sh b/builder/stage4/10-pisdr-rtlsdr/00-run.sh
similarity index 100%
rename from builder/stage4/09-pisdr-rtlsdr/00-run.sh
rename to builder/stage4/10-pisdr-rtlsdr/00-run.sh
diff --git a/builder/stage4/09-pisdr-rtlsdr/01-run.sh b/builder/stage4/10-pisdr-rtlsdr/01-run.sh
similarity index 100%
rename from builder/stage4/09-pisdr-rtlsdr/01-run.sh
rename to builder/stage4/10-pisdr-rtlsdr/01-run.sh
diff --git a/builder/stage4/10-pisdr-plutosdr/00-packages-nr b/builder/stage4/11-pisdr-plutosdr/00-packages-nr
similarity index 100%
rename from builder/stage4/10-pisdr-plutosdr/00-packages-nr
rename to builder/stage4/11-pisdr-plutosdr/00-packages-nr
diff --git a/builder/stage4/10-pisdr-plutosdr/00-run.sh b/builder/stage4/11-pisdr-plutosdr/00-run.sh
similarity index 100%
rename from builder/stage4/10-pisdr-plutosdr/00-run.sh
rename to builder/stage4/11-pisdr-plutosdr/00-run.sh
diff --git a/builder/stage4/10-pisdr-plutosdr/01-run.sh b/builder/stage4/11-pisdr-plutosdr/01-run.sh
similarity index 100%
rename from builder/stage4/10-pisdr-plutosdr/01-run.sh
rename to builder/stage4/11-pisdr-plutosdr/01-run.sh
diff --git a/builder/stage4/10-pisdr-plutosdr/02-run.sh b/builder/stage4/11-pisdr-plutosdr/02-run.sh
similarity index 100%
rename from builder/stage4/10-pisdr-plutosdr/02-run.sh
rename to builder/stage4/11-pisdr-plutosdr/02-run.sh
diff --git a/builder/stage4/10-pisdr-plutosdr/03-run.sh b/builder/stage4/11-pisdr-plutosdr/03-run.sh
similarity index 100%
rename from builder/stage4/10-pisdr-plutosdr/03-run.sh
rename to builder/stage4/11-pisdr-plutosdr/03-run.sh
diff --git a/builder/stage4/11-pisdr-hackrf/00-run.sh b/builder/stage4/12-pisdr-hackrf/00-run.sh
similarity index 100%
rename from builder/stage4/11-pisdr-hackrf/00-run.sh
rename to builder/stage4/12-pisdr-hackrf/00-run.sh
diff --git a/builder/stage4/11-pisdr-hackrf/01-run.sh b/builder/stage4/12-pisdr-hackrf/01-run.sh
similarity index 100%
rename from builder/stage4/11-pisdr-hackrf/01-run.sh
rename to builder/stage4/12-pisdr-hackrf/01-run.sh
diff --git a/builder/stage4/12-pisdr-osmocom/00-run.sh b/builder/stage4/13-pisdr-osmocom/00-run.sh
similarity index 100%
rename from builder/stage4/12-pisdr-osmocom/00-run.sh
rename to builder/stage4/13-pisdr-osmocom/00-run.sh
diff --git a/builder/stage4/13-pisdr-gqrx/00-packages-nr b/builder/stage4/14-pisdr-gqrx/00-packages-nr
similarity index 100%
rename from builder/stage4/13-pisdr-gqrx/00-packages-nr
rename to builder/stage4/14-pisdr-gqrx/00-packages-nr
diff --git a/builder/stage4/13-pisdr-gqrx/00-run.sh b/builder/stage4/14-pisdr-gqrx/00-run.sh
similarity index 100%
rename from builder/stage4/13-pisdr-gqrx/00-run.sh
rename to builder/stage4/14-pisdr-gqrx/00-run.sh
diff --git a/builder/stage4/14-pisdr-cygnusrf/00-run.sh b/builder/stage4/15-pisdr-cygnusrf/00-run.sh
similarity index 100%
rename from builder/stage4/14-pisdr-cygnusrf/00-run.sh
rename to builder/stage4/15-pisdr-cygnusrf/00-run.sh
diff --git a/builder/stage4/15-pisdr-rtl443/00-run.sh b/builder/stage4/16-pisdr-rtl443/00-run.sh
similarity index 100%
rename from builder/stage4/15-pisdr-rtl443/00-run.sh
rename to builder/stage4/16-pisdr-rtl443/00-run.sh
diff --git a/builder/stage4/16-pisdr-sdrangel/00-packages-nr b/builder/stage4/17-pisdr-sdrangel/00-packages-nr
similarity index 100%
rename from builder/stage4/16-pisdr-sdrangel/00-packages-nr
rename to builder/stage4/17-pisdr-sdrangel/00-packages-nr
diff --git a/builder/stage4/16-pisdr-sdrangel/00-run.sh b/builder/stage4/17-pisdr-sdrangel/00-run.sh
similarity index 100%
rename from builder/stage4/16-pisdr-sdrangel/00-run.sh
rename to builder/stage4/17-pisdr-sdrangel/00-run.sh
diff --git a/builder/stage4/16-pisdr-sdrangel/01-run.sh b/builder/stage4/17-pisdr-sdrangel/01-run.sh
similarity index 100%
rename from builder/stage4/16-pisdr-sdrangel/01-run.sh
rename to builder/stage4/17-pisdr-sdrangel/01-run.sh
diff --git a/builder/stage4/16-pisdr-sdrangel/02-run.sh b/builder/stage4/17-pisdr-sdrangel/02-run.sh
similarity index 100%
rename from builder/stage4/16-pisdr-sdrangel/02-run.sh
rename to builder/stage4/17-pisdr-sdrangel/02-run.sh
diff --git a/builder/stage4/16-pisdr-sdrangel/03-run.sh b/builder/stage4/17-pisdr-sdrangel/03-run.sh
similarity index 100%
rename from builder/stage4/16-pisdr-sdrangel/03-run.sh
rename to builder/stage4/17-pisdr-sdrangel/03-run.sh
diff --git a/builder/stage4/16-pisdr-sdrangel/04-run.sh b/builder/stage4/17-pisdr-sdrangel/04-run.sh
similarity index 100%
rename from builder/stage4/16-pisdr-sdrangel/04-run.sh
rename to builder/stage4/17-pisdr-sdrangel/04-run.sh
diff --git a/builder/stage4/16-pisdr-sdrangel/05-run.sh b/builder/stage4/17-pisdr-sdrangel/05-run.sh
similarity index 100%
rename from builder/stage4/16-pisdr-sdrangel/05-run.sh
rename to builder/stage4/17-pisdr-sdrangel/05-run.sh
diff --git a/builder/stage4/17-pisdr-libacars/00-packages-nr b/builder/stage4/18-pisdr-libacars/00-packages-nr
similarity index 100%
rename from builder/stage4/17-pisdr-libacars/00-packages-nr
rename to builder/stage4/18-pisdr-libacars/00-packages-nr
diff --git a/builder/stage4/17-pisdr-libacars/00-run.sh b/builder/stage4/18-pisdr-libacars/00-run.sh
similarity index 100%
rename from builder/stage4/17-pisdr-libacars/00-run.sh
rename to builder/stage4/18-pisdr-libacars/00-run.sh
diff --git a/builder/stage4/18-pisdr-acarsdec/00-run.sh b/builder/stage4/19-pisdr-acarsdec/00-run.sh
similarity index 100%
rename from builder/stage4/18-pisdr-acarsdec/00-run.sh
rename to builder/stage4/19-pisdr-acarsdec/00-run.sh
diff --git a/builder/stage4/19-pisdr-multimonng/00-run.sh b/builder/stage4/20-pisdr-multimonng/00-run.sh
similarity index 100%
rename from builder/stage4/19-pisdr-multimonng/00-run.sh
rename to builder/stage4/20-pisdr-multimonng/00-run.sh
diff --git a/builder/stage4/20-pisdr-leandvb/00-run.sh b/builder/stage4/21-pisdr-leandvb/00-run.sh
similarity index 100%
rename from builder/stage4/20-pisdr-leandvb/00-run.sh
rename to builder/stage4/21-pisdr-leandvb/00-run.sh
diff --git a/builder/stage4/21-pisdr-gpredict/00-packages-nr b/builder/stage4/22-pisdr-gpredict/00-packages-nr
similarity index 100%
rename from builder/stage4/21-pisdr-gpredict/00-packages-nr
rename to builder/stage4/22-pisdr-gpredict/00-packages-nr
diff --git a/builder/stage4/21-pisdr-gpredict/00-run.sh b/builder/stage4/22-pisdr-gpredict/00-run.sh
similarity index 100%
rename from builder/stage4/21-pisdr-gpredict/00-run.sh
rename to builder/stage4/22-pisdr-gpredict/00-run.sh
diff --git a/builder/stage4/22-pisdr-rpitx/00-packages-nr b/builder/stage4/23-pisdr-rpitx/00-packages-nr
similarity index 100%
rename from builder/stage4/22-pisdr-rpitx/00-packages-nr
rename to builder/stage4/23-pisdr-rpitx/00-packages-nr
diff --git a/builder/stage4/22-pisdr-rpitx/00-run.sh b/builder/stage4/23-pisdr-rpitx/00-run.sh
similarity index 100%
rename from builder/stage4/22-pisdr-rpitx/00-run.sh
rename to builder/stage4/23-pisdr-rpitx/00-run.sh
diff --git a/builder/stage4/25-pisdr-virgo/00-run.sh b/builder/stage4/24-pisdr-virgo/00-run.sh
similarity index 100%
rename from builder/stage4/25-pisdr-virgo/00-run.sh
rename to builder/stage4/24-pisdr-virgo/00-run.sh
diff --git a/builder/stage4/24-pisdr-quisk/00-packages-nr b/builder/stage4/25-pisdr-quisk/00-packages-nr
similarity index 100%
rename from builder/stage4/24-pisdr-quisk/00-packages-nr
rename to builder/stage4/25-pisdr-quisk/00-packages-nr
diff --git a/builder/stage4/24-pisdr-quisk/00-run.sh b/builder/stage4/25-pisdr-quisk/00-run.sh
similarity index 100%
rename from builder/stage4/24-pisdr-quisk/00-run.sh
rename to builder/stage4/25-pisdr-quisk/00-run.sh