diff --git a/groundstation/rtl_tcp.service b/groundstation/rtl_tcp.service
deleted file mode 100644
index 403425a3..00000000
--- a/groundstation/rtl_tcp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=RTL-TCP
-
-[Service]
-TimeoutStopSec = 5
-ExecStart=/bin/sh -c '/usr/local/bin/rtl_tcp -a $(hostname -I)'
-WorkingDirectory=/home/pi
-StandardOutput=inherit
-StandardError=inherit
-Restart=always
-User=root
-
-[Install]
-WantedBy=default.target
diff --git a/groundstation/rtltcp.service b/groundstation/rtltcp.service
new file mode 100644
index 00000000..f9d2405f
--- /dev/null
+++ b/groundstation/rtltcp.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=RTL TCP Service
+After=network.target
+Requires=rtltcp.socket
+
+[Service]
+Type=notify
+User=pi
+ExecStart=/usr/local/bin/rtltcp
+TimeoutStopSec=5