diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml
index 880e25c5e..537091fb9 100644
--- a/elasticsearch/Chart.yaml
+++ b/elasticsearch/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.1.0
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.1.6
+version: 0.1.7
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 83ca90ae3..d438c748f 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -547,9 +547,6 @@ conf:
   jvm_options: |
     -Xms1g
     -Xmx1g
-    -XX:+UseConcMarkSweepGC
-    -XX:CMSInitiatingOccupancyFraction=75
-    -XX:+UseCMSInitiatingOccupancyOnly
     -Des.networkaddress.cache.ttl=60
     -Des.networkaddress.cache.negative.ttl=10
     -XX:+AlwaysPreTouch
@@ -575,6 +572,9 @@ conf:
     8:-XX:+UseGCLogFileRotation
     8:-XX:NumberOfGCLogFiles=32
     8:-XX:GCLogFileSize=64m
+    8-13:-XX:+UseConcMarkSweepGC
+    8-13:-XX:CMSInitiatingOccupancyFraction=75
+    8-13:-XX:+UseCMSInitiatingOccupancyOnly
     9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
     9-:-Djava.locale.providers=COMPAT
     10-:-XX:UseAVX=2
diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml
index 26c4ff28d..28dda86e2 100644
--- a/releasenotes/notes/elasticsearch.yaml
+++ b/releasenotes/notes/elasticsearch.yaml
@@ -7,4 +7,5 @@ elasticsearch:
   - 0.1.4 Add elasticsearch ILM functionality
   - 0.1.5 Make templates job more generic
   - 0.1.6 Fix elasticsearch-master rendering error
+  - 0.1.7 Pin Java options to specific versions
 ...