diff --git a/.gitmodules b/.gitmodules
index 51f2e94..3171e80 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "pimod"]
-	path = pimod
-	url = https://github.com/Nature40/pimod.git
 [submodule "home/pi/pyradiotracking"]
 	path = home/pi/pyradiotracking
 	url = https://github.com/tRackIT-Systems/pyradiotracking.git
@@ -13,3 +10,9 @@
 [submodule "home/pi/snd-i2s_rpi"]
 	path = home/pi/snd-i2s_rpi
 	url = https://github.com/tRackIT-Systems/snd-i2s_rpi.git
+[submodule "home/pi/librtlsdr"]
+	path = home/pi/librtlsdr
+	url = https://github.com/librtlsdr/librtlsdr.git
+[submodule "home/pi/pyrtlsdr"]
+	path = home/pi/pyrtlsdr
+	url = https://github.com/pyrtlsdr/pyrtlsdr.git
diff --git a/docker-compose.yml b/docker-compose.yml
index e2feada..e9eac28 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,10 @@
 services:
   pimod:
-    build: ./pimod
+    image: nature40/pimod:v0.6.1
     privileged: true
     tty: true
     volumes:
-      - .:/sensorboxes
-      - ./pimod:/pimod
-    working_dir: /sensorboxes
+      - .:/tRackIT-OS
+    working_dir: /tRackIT-OS
     environment:
-      - PATH:'$PATH:/pimod'
       - IMG
diff --git a/home/pi/librtlsdr b/home/pi/librtlsdr
new file mode 160000
index 0000000..cd36c28
--- /dev/null
+++ b/home/pi/librtlsdr
@@ -0,0 +1 @@
+Subproject commit cd36c28815592af4080d71181964909125a74f44
diff --git a/home/pi/pyradiotracking b/home/pi/pyradiotracking
index 0205c2b..52b1a72 160000
--- a/home/pi/pyradiotracking
+++ b/home/pi/pyradiotracking
@@ -1 +1 @@
-Subproject commit 0205c2bbb1e1e82ea40c0f3d8680ff83329c27c6
+Subproject commit 52b1a721ba6445a42c5c3db4749e1a86265d13b4
diff --git a/home/pi/pyrtlsdr b/home/pi/pyrtlsdr
new file mode 160000
index 0000000..0450698
--- /dev/null
+++ b/home/pi/pyrtlsdr
@@ -0,0 +1 @@
+Subproject commit 0450698ff50a45c149b2fe6d31b51055723a8099
diff --git a/pimod b/pimod
deleted file mode 160000
index 4de428c..0000000
--- a/pimod
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4de428cf75806f2449cebac97cd5f2cb77feae9d
diff --git a/tRackIT-OS.Pifile b/tRackIT-OS.Pifile
index 692b13a..cb2a3d2 100644
--- a/tRackIT-OS.Pifile
+++ b/tRackIT-OS.Pifile
@@ -1,9 +1,9 @@
 # Set default ARCH
 : ${ARCH:=arm64}
 
-FROM "https://github.com/tRackIT-Systems/tsOS-Base/releases/download/2024.07.2/tsOS-Base-${ARCH}-2024.07.2.zip"
+FROM "https://github.com/tRackIT-Systems/tsOS-Base/releases/download/2024.09.2/tsOS-Base-${ARCH}-2024.09.2.zip"
 TO "tRackIT-OS-${ARCH}.img"
-PUMP 300M
+PUMP 400M
 
 # Set os-release info
 NAME="tRackIT-OS"
@@ -39,8 +39,19 @@ RUN chown -R pi:pi /home/pi/
 # Blacklist DVB-T driver
 RUN tee -a /etc/modprobe.d/raspi-blacklist.conf <<<'blacklist dvb_usb_rtl28xxu'
 
+# Install rtlsdr build dependencies
+RUN apt update
+RUN apt-get install -y build-essential cmake
+
+WORKDIR /home/pi/librtlsdr
+RUN cmake . -DINSTALL_UDEV_RULES=ON
+RUN make -j4
+RUN make install
+RUN ldconfig
+
+RUN python3 -m pip install --break-system-packages -e /home/pi/pyrtlsdr
+
 # Install radiotracking dependencies
-RUN apt-get install -y librtlsdr-dev
 RUN python3 -m pip install --break-system-packages dash
 
 # Install radiotracking
@@ -52,3 +63,6 @@ RUN tee -a /etc/sysdweb.conf <<EOF
 title = RadioTracking | VHF Signal Detection
 unit = radiotracking
 EOF
+
+# Disable swap
+RUN systemctl disable dphys-swapfile.service