diff --git a/stage4/07-pisdr-limesdr/00-packages-nr b/stage4/07-pisdr-limesdr/00-packages-nr
index 1420797..e8fa6ae 100644
--- a/stage4/07-pisdr-limesdr/00-packages-nr
+++ b/stage4/07-pisdr-limesdr/00-packages-nr
@@ -2,5 +2,5 @@ swig
 libsqlite3-dev
 libi2c-dev
 libusb-1.0-0-dev
-libwxgtk3.0-dev
+libwxgtk3.0-gtk3-dev
 freeglut3-dev
\ No newline at end of file
diff --git a/stage4/12-pisdr-gnuradio/00-packages-nr b/stage4/12-pisdr-gnuradio/00-packages-nr
index 8162b54..942501c 100644
--- a/stage4/12-pisdr-gnuradio/00-packages-nr
+++ b/stage4/12-pisdr-gnuradio/00-packages-nr
@@ -4,8 +4,6 @@ libfftw3-dev
 libgsl-dev
 libcppunit-dev
 libcomedi-dev
-libqt4-opengl-dev
-libqwt-dev
 libsdl1.2-dev
 libusb-1.0-0-dev
 libasound2-dev
@@ -19,6 +17,9 @@ libqwt-qt5-dev
 libqt5opengl5-dev
 libcodec2-dev
 libsndfile1-dev
+pybind11-dev
+gir1.2-gtk-3.0
+swig
 
 python3-numpy
 python3-mako
@@ -33,3 +34,5 @@ python3-scipy
 python3-pip
 python3-gi-cairo
 python3-matplotlib
+python3-pygccxml
+python3-pyqtgraph
\ No newline at end of file
diff --git a/stage4/14-pisdr-gqrx/00-packages-nr b/stage4/14-pisdr-gqrx/00-packages-nr
index ea48125..a80ec40 100644
--- a/stage4/14-pisdr-gqrx/00-packages-nr
+++ b/stage4/14-pisdr-gqrx/00-packages-nr
@@ -4,7 +4,6 @@ libtool
 libfftw3-dev
 libusb-1.0-0-dev
 libusb-dev
-qt5-default
 qtbase5-dev
 qtchooser
 libqt5multimedia5-plugins
diff --git a/stage4/17-pisdr-sdrangel/00-packages-nr b/stage4/17-pisdr-sdrangel/00-packages-nr
index 2d0bf05..8990ffa 100644
--- a/stage4/17-pisdr-sdrangel/00-packages-nr
+++ b/stage4/17-pisdr-sdrangel/00-packages-nr
@@ -8,7 +8,6 @@ libtool
 libfftw3-dev
 libusb-1.0-0-dev
 libusb-dev
-qt5-default
 qtbase5-dev
 qtchooser
 libqt5multimedia5-plugins
diff --git a/stage4/23-pisdr-rpitx/00-packages-nr b/stage4/23-pisdr-rpitx/00-packages-nr
index e45a81c..5e3f258 100644
--- a/stage4/23-pisdr-rpitx/00-packages-nr
+++ b/stage4/23-pisdr-rpitx/00-packages-nr
@@ -11,6 +11,6 @@ libmagickcore-6.q16-6
 libmagickcore-6.q16-6-extra
 libmagickwand-6.q16-6
 libnetpbm10
-libpng12-0
+libpng-dev
 libwmf0.2-7
 netpbm
\ No newline at end of file
diff --git a/stage4/25-pisdr-quisk/00-packages-nr b/stage4/25-pisdr-quisk/00-packages-nr
index cf089ab..e005dc1 100644
--- a/stage4/25-pisdr-quisk/00-packages-nr
+++ b/stage4/25-pisdr-quisk/00-packages-nr
@@ -1,14 +1,9 @@
-python-wxgtk3.0
 python3-wxgtk4.0
 libfftw3-dev
 libasound2-dev
 portaudio19-dev
 libpulse-dev
-libpython2.7-dev
 libpython3-dev
-python-usb
 python3-usb
-python-setuptools
 python3-setuptools
-python-pip
 python3-pip
\ No newline at end of file
diff --git a/stage4/25-pisdr-quisk/00-run.sh b/stage4/25-pisdr-quisk/00-run.sh
index dd0a480..6c2485e 100755
--- a/stage4/25-pisdr-quisk/00-run.sh
+++ b/stage4/25-pisdr-quisk/00-run.sh
@@ -1,6 +1,5 @@
 #!/bin/bash -e
 
 on_chroot << EOF
-python2 -m pip install --upgrade quisk
 python3 -m pip install --upgrade quisk
 EOF
\ No newline at end of file