diff --git a/Base.Pifile b/Base.Pifile
index aa67f21..e7606a2 100644
--- a/Base.Pifile
+++ b/Base.Pifile
@@ -67,9 +67,6 @@ RUN chmod 644       /root/.ssh/authorized_keys
 # Set Europe/Berlin timezone
 RUN ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 
-# add hdd mount to fstab
-RUN bash -c 'echo "/dev/sda1 /data ext4 defaults,auto,nofail 0 0" >> /etc/fstab'
-
 # set git config for possible local commits
 RUN git config --global user.email "root@nature40-sensorbox"
 RUN git config --global user.name "Nature 4.0 Sensorbox"
diff --git a/Base/etc/fstab b/Base/etc/fstab
new file mode 100644
index 0000000..1eb21f0
--- /dev/null
+++ b/Base/etc/fstab
@@ -0,0 +1,4 @@
+proc                    /proc           proc    defaults                        0       0
+PARTUUID=8f4dbd00-01    /boot           vfat    defaults,user,umask=000         0       2
+PARTUUID=8f4dbd00-02    /               ext4    defaults,noatime                0       1
+/dev/sda1               /data           ext4    defaults,auto,nofail            0       0
diff --git a/RadioTracking/etc/systemd/system/radiotracking.service b/RadioTracking/etc/systemd/system/radiotracking.service
index b1c1fb8..adb3015 100644
--- a/RadioTracking/etc/systemd/system/radiotracking.service
+++ b/RadioTracking/etc/systemd/system/radiotracking.service
@@ -10,6 +10,8 @@ ExecStartPre=+/bin/bash -c "echo 0 > /sys/module/usbcore/parameters/usbfs_memory
 ExecStart=/usr/bin/python3 -m radiotracking --config /boot/radiotracking.ini
 Restart=always
 RestartSec=10s
+User=pi
+Group=pi
 
 [Install]
 WantedBy=multi-user.target
diff --git a/RadioTracking/home/pi/pyradiotracking b/RadioTracking/home/pi/pyradiotracking
index 14021b0..c8ddf11 160000
--- a/RadioTracking/home/pi/pyradiotracking
+++ b/RadioTracking/home/pi/pyradiotracking
@@ -1 +1 @@
-Subproject commit 14021b0188b184107a82c7d143255a9796cdd92b
+Subproject commit c8ddf11879fa7a9a2b9358e63fce4c73ca2a8eeb