diff --git a/start b/start
index 20fa420..369b0d2 100755
--- a/start
+++ b/start
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Cleanly kill supervisor when container is stopped
-trap 'kill $(jobs -p)' EXIT
-
 if [ "$ELASTICSEARCH_HOSTNAME" != "" ]; then
     sed -i -r "s/^(#\s?+)?elasticsearch.url: .+/elasticsearch.url: \"http:\/\/${ELASTICSEARCH_HOSTNAME}\/\"/" /opt/kibana/config/kibana.yml
 fi
@@ -13,4 +10,8 @@ if [ "$KIBANA_PORT" != "" ]; then
     sed -i -E "s/^(#\s?+)?server.port: .+/server.port: $KIBANA_PORT/" /opt/kibana/config/kibana.yml
 fi
 
+if [ "$KIBANA_INDEX" != "" ]; then
+    sed -i -E "s/^(#\s?+)?kibana\.index: .+/kibana.index: $KIBANA_INDEX/" /opt/kibana/config/kibana.yml
+fi
+
 su -c /opt/kibana/bin/kibana kibana