diff --git a/mnt-usb.mount b/mnt-usb.mount
new file mode 100644
index 0000000..3b6a346
--- /dev/null
+++ b/mnt-usb.mount
@@ -0,0 +1,11 @@
+[Unit]
+Description=USB mount
+
+[Mount]
+What=/dev/sda1
+Where=/mnt/usb
+Type=vfat
+Options=rw,uid=pi,gid=pi,fmask=0022,dmask=0022,defaults
+
+[Install]
+WantedBy=multi-user.target
diff --git a/webcam-streamer.service b/webcam-streamer.service
index 79b0fde..1ac5087 100644
--- a/webcam-streamer.service
+++ b/webcam-streamer.service
@@ -34,22 +34,14 @@ ExecStart=/bin/bash -c 'rpicam-vid --inline \
                 -thread_queue_size 1024 \
                 -i pipe:0 \
                 -c:v copy \
-                -f tee -map 0:0 -flags +global_header -flvflags no_duration_filesize \
-                "[f=segment \
-                        :segment_format=mp4 \
-                        :segment_time=${SEGMENT_DURATION} \
-                        :reset_timestamps=1 \
-                        :strftime=1 \
-                        :onfail=ignore \
-                ]${DIR}/${FILENAME_PREFIX}${FILENAME_SEGMENT_PATTERN}.${FILENAME_EXT} \
-                | \
-                [f=fifo \
-                        :fifo_format=flv \
-                        :drop_pkts_on_overflow=1 \
-                        :attempt_recovery=1 \
-                        :recovery_wait_time=1 \
-                        :use_wallclock_as_timestamps=1 \
-                ]${PEERTUBE_LIVE}${LIVE_KEY}"'
+		-map 0:0 \
+                -f segment \
+		-segment_time ${SEGMENT_DURATION} \
+		-strftime 1 \
+		-reset_timestamps 1 \
+		-segment_format mp4 \
+                ${DIR}/${FILENAME_PREFIX}${FILENAME_SEGMENT_PATTERN}.${FILENAME_EXT} \
+	'
 
 ExecStop=-/usr/bin/env sh -c 'killall rpicam-vid 2>/dev/null || true'