diff --git a/builder/stage4/04-pisdr-system/01-run.sh b/builder/stage4/04-pisdr-system/01-run.sh
index e968c5a..583d3e5 100755
--- a/builder/stage4/04-pisdr-system/01-run.sh
+++ b/builder/stage4/04-pisdr-system/01-run.sh
@@ -2,6 +2,7 @@ install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 install -v -o 1000 -g 1000 -m 755 shortcut/gnuradio.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 install -v -o 1000 -g 1000 -m 755 shortcut/gqrx.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 install -v -o 1000 -g 1000 -m 755 shortcut/sdrangel.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
+install -v -o 1000 -g 1000 -m 755 shortcut/gpredict.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop/"
 
 install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/usr/share/rpd-wallpaper/"
 install -v -o 1000 -g 1000 -m 755 wallpaper/donald-giannatti-vla.jpg "${ROOTFS_DIR}/usr/share/rpd-wallpaper/"
diff --git a/builder/stage4/04-pisdr-system/shortcut/gpredict.desktop b/builder/stage4/04-pisdr-system/shortcut/gpredict.desktop
new file mode 100644
index 0000000..ff40dba
--- /dev/null
+++ b/builder/stage4/04-pisdr-system/shortcut/gpredict.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=GPredict
+Comment=GPredict
+Icon=/home/pi/PiSDR/Software/gpredict/pixmaps/icons/gpredict-icon.png
+Exec=gpredict 
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
\ No newline at end of file
diff --git a/builder/stage4/20-pisdr-leandvb/00-run.sh b/builder/stage4/20-pisdr-leandvb/00-run.sh
new file mode 100755
index 0000000..6192260
--- /dev/null
+++ b/builder/stage4/20-pisdr-leandvb/00-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "leansdr" ]; then
+    git clone https://github.com/pabr/leansdr.git
+fi
+
+cd leansdr/src/apps
+make -j$(nproc)
+ldconfig
+EOF
\ No newline at end of file
diff --git a/builder/stage4/21-pisdr-gpredict/00-packages-nr b/builder/stage4/21-pisdr-gpredict/00-packages-nr
new file mode 100644
index 0000000..ef38605
--- /dev/null
+++ b/builder/stage4/21-pisdr-gpredict/00-packages-nr
@@ -0,0 +1,3 @@
+intltool
+libcurl4-openssl-dev
+libgoocanvas-2.0-dev
\ No newline at end of file
diff --git a/builder/stage4/21-pisdr-gpredict/00-run.sh b/builder/stage4/21-pisdr-gpredict/00-run.sh
new file mode 100755
index 0000000..fdc0a71
--- /dev/null
+++ b/builder/stage4/21-pisdr-gpredict/00-run.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "gpredict" ]; then
+    git clone https://github.com/csete/gpredict.git
+fi
+
+cd gpredict
+git pull
+bash autogen.sh
+make -j$(nproc) install
+ldconfig
+EOF
\ No newline at end of file
diff --git a/builder/stage4/22-pisdr-rpitx/00-packages-nr b/builder/stage4/22-pisdr-rpitx/00-packages-nr
new file mode 100644
index 0000000..e45a81c
--- /dev/null
+++ b/builder/stage4/22-pisdr-rpitx/00-packages-nr
@@ -0,0 +1,16 @@
+ghostscript
+gsfonts
+imagemagick
+imagemagick-6-common
+imagemagick-6.q16
+libheif1
+libjxr-tools
+libjxr0
+liblqr-1-0
+libmagickcore-6.q16-6
+libmagickcore-6.q16-6-extra
+libmagickwand-6.q16-6
+libnetpbm10
+libpng12-0
+libwmf0.2-7
+netpbm
\ No newline at end of file
diff --git a/builder/stage4/22-pisdr-rpitx/00-run.sh b/builder/stage4/22-pisdr-rpitx/00-run.sh
new file mode 100755
index 0000000..34fb936
--- /dev/null
+++ b/builder/stage4/22-pisdr-rpitx/00-run.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+on_chroot << EOF
+mkdir -p    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+cd 		    "/home/${FIRST_USER_NAME}/PiSDR/Software"
+
+if [ ! -d "rpitx" ]; then
+    git clone https://github.com/F5OEO/rpitx.git
+fi
+EOF
\ No newline at end of file