diff --git a/CHANGELOG.md b/CHANGELOG.md
index de064a55..62590672 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Changed
 
+* elasticsearch: Use `/etc/elasticsearch/jvm.options.d/evolinux` instead of default `/etc/elasticsearch/jvm.options`
 * openvpn: make it compatible with OpenBSD and add some improvements
 
 ### Fixed
diff --git a/elasticsearch/tasks/configuration.yml b/elasticsearch/tasks/configuration.yml
index 5afa94b0..6d9b9542 100644
--- a/elasticsearch/tasks/configuration.yml
+++ b/elasticsearch/tasks/configuration.yml
@@ -96,17 +96,25 @@
 
 - name: JVM Heap size (min) is set
   lineinfile:
-    dest: /etc/elasticsearch/jvm.options
+    dest: /etc/elasticsearch/jvm.options.d/evolinux
     regexp: "^-Xms"
     line: "-Xms{{ elasticsearch_jvm_xms }}"
+    create: yes
+    owner: root
+    group: elasticsearch
+    mode: 0640
   tags:
     - config
 
 - name: JVM Heap size (max) is set
   lineinfile:
-    dest: /etc/elasticsearch/jvm.options
+    dest: /etc/elasticsearch/jvm.options.d/evolinux
     regexp: "^-Xmx"
     line: "-Xmx{{ elasticsearch_jvm_xmx }}"
+    create: yes
+    owner: root
+    group: elasticsearch
+    mode: 0640
   tags:
     - config
 
diff --git a/elasticsearch/tasks/tmpdir.yml b/elasticsearch/tasks/tmpdir.yml
index 920300d7..6164731f 100644
--- a/elasticsearch/tasks/tmpdir.yml
+++ b/elasticsearch/tasks/tmpdir.yml
@@ -26,10 +26,13 @@
 
     - name: change JVM tmpdir (< 6.x)
       lineinfile:
-        dest: /etc/elasticsearch/jvm.options
+        dest: /etc/elasticsearch/jvm.options.d/evolinux
         line: "-Djava.io.tmpdir={{ _elasticsearch_custom_tmpdir }}"
         regexp: "^-Djava.io.tmpdir="
-        insertafter: "## JVM configuration"
+        create: yes
+        owner: root
+        group: elasticsearch
+        mode: 0640
       notify:
         - restart elasticsearch
       tags:
@@ -48,6 +51,7 @@
         - elasticsearch
       when: elastic_stack_version is version('6', '>=')
 
+    # Note : Should not do any changes as -Djava.io.tmpdir=${ES_TMPDIR} is already here in the default config.
     - name: change JVM tmpdir (>= 6.x)
       lineinfile:
         dest: /etc/elasticsearch/jvm.options