diff --git a/systemd/rpi_h264_decode.service b/systemd/rpi_h264_decode.service
index aa36d6d11..338969e25 100644
--- a/systemd/rpi_h264_decode.service
+++ b/systemd/rpi_h264_decode.service
@@ -1,11 +1,14 @@
 [Unit]
-Description=rpi_h264_decode_service
+Description=rpi_h264_decode
 
 [Service]
 User=root
-ExecStart=gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H264' ! rtph264depay ! 'video/x-h264,stream-format=byte-stream' ! fdsink | hello_video.bin
+
+# Video decode via omx, started by QOpenHD if needed (and stopped if needed)
+ExecStart=/bin/sh -c "gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, media=(string)video, clock-rate=(int)90000, encoding-name=(string)H264' ! rtph264depay ! 'video/x-h264,stream-format=byte-stream' ! fdsink | fpv_video0.bin /dev/stdin"
+
 Restart=always
-RestartSec=3
+RestartSec=1
 
 [Install]
 WantedBy=multi-user.target