diff --git a/docker/Dockerfile b/docker/Dockerfile
index 27d360815..fad9b0515 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -119,7 +119,9 @@ ENV PATH=$PATH:/usr/lib/btbn-ffmpeg/bin
 
 # install go2rtc
 RUN wget -O go2rtc "https://github.com/AlexxIT/go2rtc/releases/download/v0.1-beta.8/go2rtc_linux_${TARGETARCH}" \
-    && chmod +x go2rtc
+    && chmod +x go2rtc \
+    && mkdir -p /usr/local/go2rtc/sbin/ \
+    && mv go2rtc /usr/local/sbin/go2rtc
 
 COPY --from=nginx /usr/local/nginx/ /usr/local/nginx/
 
diff --git a/docker/rootfs/etc/services.d/go2rtc/finish b/docker/rootfs/etc/services.d/go2rtc/finish
new file mode 100644
index 000000000..24482e77f
--- /dev/null
+++ b/docker/rootfs/etc/services.d/go2rtc/finish
@@ -0,0 +1,5 @@
+#!/usr/bin/execlineb -S1
+if { s6-test ${1} -ne 0 }
+if { s6-test ${1} -ne 256 }
+
+s6-svscanctl -t /var/run/s6/services
\ No newline at end of file
diff --git a/docker/rootfs/etc/services.d/go2rtc/run b/docker/rootfs/etc/services.d/go2rtc/run
new file mode 100644
index 000000000..f690abae1
--- /dev/null
+++ b/docker/rootfs/etc/services.d/go2rtc/run
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+/usr/local/go2rtc/sbin/go2rtc
\ No newline at end of file