diff --git a/files/systemd/elasticsearch_override.conf b/files/systemd/elasticsearch_override.conf
new file mode 100644
index 0000000..bf02203
--- /dev/null
+++ b/files/systemd/elasticsearch_override.conf
@@ -0,0 +1,2 @@
+[Service]
+LimitMEMLOCK=infinity
diff --git a/tasks/elasticsearch-config.yml b/tasks/elasticsearch-config.yml
index 3d4f304..e3437f2 100644
--- a/tasks/elasticsearch-config.yml
+++ b/tasks/elasticsearch-config.yml
@@ -24,10 +24,23 @@
   template: src=elasticsearch.j2 dest={{ default_file }} mode=0644 force=yes
   notify: restart elasticsearch
 
+#Copy the systemd specific file if systemd is installed
+- when: use_system_d and m_lock_enabled
+  become: yes
+  block:
+    - name: Make sure destination dir exists
+      file: path={{ sysd_config_file | dirname }} state=directory mode=0755
+  
+    - name: Copy specific ElasticSearch Systemd config file
+      ini_file: path={{ sysd_config_file }} section=Service option=LimitMEMLOCK value=infinity mode=0644
+      notify:
+       - reload systemd configuration
+       - restart elasticsearch
+
 #Copy the logging.yml
 - name: Copy log4j2.properties File
   become: yes
-  template: src={{es_config_log4j2}} dest={{ es_conf_dir }}/log4j2.properties owner={{ es_user }} group={{ es_group }} mode=0644 force=yes
+  template: src={{ es_config_log4j2 }} dest={{ es_conf_dir }}/log4j2.properties owner={{ es_user }} group={{ es_group }} mode=0644 force=yes
   notify: restart elasticsearch
 
 - name: Copy jvm.options File
diff --git a/tasks/elasticsearch-parameters.yml b/tasks/elasticsearch-parameters.yml
index a27088a..36c3fe1 100644
--- a/tasks/elasticsearch-parameters.yml
+++ b/tasks/elasticsearch-parameters.yml
@@ -28,3 +28,7 @@
 
 - name: set fact m_lock_enabled
   set_fact: m_lock_enabled={{ es_config['bootstrap.memory_lock'] is defined and es_config['bootstrap.memory_lock'] == True }}
+
+- name: set fact use_system_d
+  set_fact: use_system_d={{(ansible_distribution == 'Debian' and ansible_distribution_version is version_compare('8', '>=')) or (ansible_distribution in ['RedHat','CentOS'] and ansible_distribution_version is version_compare('7', '>=')) or (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version_compare('15', '>=')) }}
+
diff --git a/vars/main.yml b/vars/main.yml
index d640fc4..91b7b69 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,3 +1,4 @@
 ---
 es_package_url: "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch"
 reserved_xpack_users: ["elastic","kibana","logstash_system"]
+sysd_config_file: "/etc/systemd/system/elasticsearch.service.d/override.conf"