diff --git a/README.md b/README.md
index 4ee3c55..0716516 100644
--- a/README.md
+++ b/README.md
@@ -208,5 +208,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **02.07.19:** - Stop container if fleet fails.
 * **19.05.19:** - Use new base images for arm versions.
 * **01.04.19:** - Initial Release
diff --git a/readme-vars.yml b/readme-vars.yml
index 4a06bd5..9329fd4 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -74,5 +74,6 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "02.07.19:", desc: "Stop container if fleet fails." }
   - { date: "19.05.19:", desc: "Use new base images for arm versions." }
   - { date: "01.04.19:", desc: "Initial Release" }
diff --git a/root/etc/services.d/fleet/finish b/root/etc/services.d/fleet/finish
new file mode 100644
index 0000000..1304815
--- /dev/null
+++ b/root/etc/services.d/fleet/finish
@@ -0,0 +1,3 @@
+#!/usr/bin/execlineb -S0
+
+s6-svscanctl -t /var/run/s6/services
\ No newline at end of file