diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index 9c22cf75d..ffde00b76 100644
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.6.2
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.2.14
+version: 0.2.15
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch
diff --git a/elasticsearch/templates/bin/_elasticsearch.sh.tpl b/elasticsearch/templates/bin/_elasticsearch.sh.tpl
index 778f27657..dcf32f564 100644
--- a/elasticsearch/templates/bin/_elasticsearch.sh.tpl
+++ b/elasticsearch/templates/bin/_elasticsearch.sh.tpl
@@ -133,7 +133,16 @@ function start_data_node () {
     # (The only side effect of not doing so is slower start up times. See flush documentation linked above)
 
     echo "Node ${NODE_NAME} is ready to shutdown"
-    kill -TERM 1
+
+    echo "Killing Elasticsearch background processes"
+    jobs -p | xargs -t -r kill -TERM
+    wait
+
+    # remove the trap handler
+    trap - TERM EXIT HUP INT
+
+    echo "Node ${NODE_NAME} shutdown is complete"
+    exit 0
   }
   trap drain_data_node TERM EXIT HUP INT
   wait
diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml
index 9b6ba69d9..907550ce6 100644
--- a/releasenotes/notes/elasticsearch.yaml
+++ b/releasenotes/notes/elasticsearch.yaml
@@ -24,4 +24,5 @@ elasticsearch:
   - 0.2.12 Helm 3 - Fix Job labels
   - 0.2.13 Update htk requirements
   - 0.2.14 Fix cronjob rendering
+  - 0.2.15 Fix elasticsearch-data shutdown
 ...