diff --git a/root/var/signalytic/clientapps/streamline/streamline-emr/entry b/root/var/signalytic/clientapps/streamline/streamline-emr/entry
index 86f2f95e..66237eb5 100755
--- a/root/var/signalytic/clientapps/streamline/streamline-emr/entry
+++ b/root/var/signalytic/clientapps/streamline/streamline-emr/entry
@@ -2,6 +2,13 @@
 
 LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+function cleanup {
+  ${LOCATION}/stop
+  echo "done."
+}
+
+trap cleanup EXIT
+
 # start all instances
 ${LOCATION}/start
 
@@ -15,6 +22,3 @@ for f in $(find ${LOCATION} -mindepth 2 -maxdepth 3 -name docker-compose.yml); d
 done
 echo "waiting on processes: ${pids[@]}"
 wait -n ${pids[@]} > /dev/null
-
-# cleanup
-${LOCATION}/stop