diff --git a/.gitmodules b/.gitmodules
index 6d71c4db..c2147600 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "modules/gst-rpicamsrc"]
-	path = modules/gst-rpicamsrc
-	url = https://github.com/thaytan/gst-rpicamsrc.git
 [submodule "modules/mavlink-router"]
 	path = modules/mavlink-router
 	url = https://github.com/mavlink-router/mavlink-router
diff --git a/README.md b/README.md
index 4569c4e6..c26b04f3 100644
--- a/README.md
+++ b/README.md
@@ -105,16 +105,8 @@ pip3 install netifaces --user
 For some systems (such as the Raspberry Pi), additional permissions may be requires to run ``nmcli`` from the
 default user. In ``/etc/NetworkManager/NetworkManager.conf`` add ``auth-polkit=false`` in the ``main`` section.
 
-If the Raspberry Pi Camera is intended to be used, the specific Gstreamer element (credit to 
-https://github.com/thaytan/gst-rpicamsrc) must be installed:
-
-```
-git submodule init && git submodule update
-cd ./modules/gst-rpicamsrc
-./autogen.sh --prefix=/usr --libdir=/usr/lib/arm-linux-gnueabihf/
-make
-sudo make install
-```
+If an older version of the Raspberry Pi OS is used (Buster, V10 or below), the ``gst-rpicamsrc`` Gstreamer element
+must be installed. See https://github.com/thaytan/gst-rpicamsrc for install instructions.
 
 To (optionally) use the Zerotier and/or Wireguard VPN's, install as follows:
 
diff --git a/deploy/RasPi2-3-4-deploy.sh b/deploy/RasPi2-3-4-deploy.sh
index c28a532e..63200330 100755
--- a/deploy/RasPi2-3-4-deploy.sh
+++ b/deploy/RasPi2-3-4-deploy.sh
@@ -27,8 +27,8 @@ echo "dtoverlay=gpio-poweroff" | sudo tee -a /boot/config.txt >/dev/null
 ## Packages
 sudo apt update
 sudo apt upgrade -y
-sudo apt install -y libgstreamer1.0-dev libgstrtspserver-1.0-dev gstreamer1.0-plugins-good gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-ugly
-sudo apt install -y network-manager python3 python3-dev python3-gst-1.0 python3-pip dnsmasq git ninja-build autoconf libtool
+sudo apt install -y gstreamer1.0-plugins-good gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-ugly
+sudo apt install -y network-manager python3 python3-dev python3-gst-1.0 python3-pip dnsmasq git ninja-build
 
 sudo apt purge -y modemmanager
 sudo apt remove -y nodejs nodejs-doc
@@ -44,19 +44,11 @@ echo "PATH=\$PATH:~/.local/bin" >> ~/.profile
 source ~/.profile
 
 sudo pip3 install meson
-pip3 install netifaces --user
+pip3 install netifaces picamera2 --user
 
 ## Configure nmcli to not need sudo
 sudo sed -i.bak -e '/^\[main\]/aauth-polkit=false' /etc/NetworkManager/NetworkManager.conf
 
-## GStreamer raspi
-cd ../modules/gst-rpicamsrc
-perl -pe 's/(encoded_buffer_q, 500)/encoded_buffer_q, 5000/' -i ./src/RaspiCapture.c
-./autogen.sh --prefix=/usr --libdir=/usr/lib/arm-linux-gnueabihf/
-make
-sudo make install
-cd ../../deploy
-
 ## Zerotier and wireguard
 curl -s https://install.zerotier.com | sudo bash
 sudo apt install -y wireguard wireguard-tools resolvconf
diff --git a/deploy/RasPiZero-deploy.sh b/deploy/RasPiZero-deploy.sh
index 43934882..f9eb3c9b 100755
--- a/deploy/RasPiZero-deploy.sh
+++ b/deploy/RasPiZero-deploy.sh
@@ -27,7 +27,7 @@ echo "dtoverlay=gpio-poweroff" | sudo tee -a /boot/config.txt >/dev/null
 ## Packages
 sudo apt update
 sudo apt upgrade -y
-sudo apt install -y libgstreamer1.0-dev libgstrtspserver-1.0-dev gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly
+sudo apt install -y gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly
 sudo apt install -y gstreamer1.0-plugins-base-apps 
 sudo apt install -y python3 python3-dev python3-gst-1.0 python3-pip dnsmasq git ninja-build
 
@@ -43,16 +43,7 @@ echo "PATH=\$PATH:~/.local/bin" >> ~/.profile
 source ~/.profile
 
 sudo pip3 install meson
-pip3 install netifaces --user
-
-## GStreamer raspi
-cd ../modules/gst-rpicamsrc
-# Fix bug with low framerates in raspicam
-perl -pe 's/(encoded_buffer_q, 500)/encoded_buffer_q, 5000/' -i ./src/RaspiCapture.c
-./autogen.sh --prefix=/usr --libdir=/usr/lib/arm-linux-gnueabihf/
-make
-sudo make install
-cd ../../deploy
+pip3 install netifaces picamera2 --user
 
 ## Zerotier and wireguard
 curl -s https://install.zerotier.com | sudo bash
diff --git a/modules/gst-rpicamsrc b/modules/gst-rpicamsrc
deleted file mode 160000
index 79860a0b..00000000
--- a/modules/gst-rpicamsrc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 79860a0b2a0f3beef6ccfab0cf7d531e55e3b06c