diff --git a/Dockerfile b/Dockerfile
index 9808209cd..9ab476eb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:alpine as builder
+FROM rust:alpine AS builder
 
 RUN apk add build-base openssl-dev
 WORKDIR "/usr/share/bytebeam/uplink"
@@ -28,4 +28,3 @@ CMD ["/usr/bin/runsvdir", "/etc/runit"]
 
 COPY paths/ paths
 COPY simulator.sh .
-
diff --git a/runit/simulator/finish b/runit/simulator/finish
new file mode 100755
index 000000000..c54781b94
--- /dev/null
+++ b/runit/simulator/finish
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd /usr/share/bytebeam/uplink
+
+exec ./simulator.sh kill_devices
+echo "Killed all simulated devices"
diff --git a/runit/uplink/run b/runit/simulator/run
similarity index 100%
rename from runit/uplink/run
rename to runit/simulator/run