diff --git a/jvb/rootfs/etc/services.d/jvb/finish b/jvb/rootfs/etc/services.d/jvb/finish
new file mode 100644
index 0000000..9f7171a
--- /dev/null
+++ b/jvb/rootfs/etc/services.d/jvb/finish
@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bash
+
+# When the jvb is shutdown (or gracefully shutdown), it exits with code 0.
+# In this case, we don't want S6 to restart the service. We want to stop all
+# services and shutdown the container.
+
+if [[ $1 -eq 0 ]]; then
+  s6-svscanctl -t /var/run/s6/services
+fi