diff --git a/defaults/main.yml b/defaults/main.yml
index 9d7e2c2..a3f3ed3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,3 +3,5 @@ es_major_version: "1.5"
 es_version: "1.5.2"
 es_start_service: true
 es_plugins_reinstall: false
+es_user: elasticsearch
+es_group: elasticsearch
diff --git a/tasks/elasticsearch-Debian.yml b/tasks/elasticsearch-Debian.yml
index 682b90d..b14e3e6 100644
--- a/tasks/elasticsearch-Debian.yml
+++ b/tasks/elasticsearch-Debian.yml
@@ -11,3 +11,18 @@
   lineinfile: dest=/etc/default/elasticsearch regexp="^ES_HEAP_SIZE" insertafter="^#ES_HEAP_SIZE" line="ES_HEAP_SIZE={{ es_heap_size }}"
   when: es_heap_size is defined
   register: elasticsearch_configure
+- name: Debian - configure data store
+  lineinfile: dest=/etc/default/elasticsearch regexp="^ES_DATA_DIR" insertafter="^#ES_DATA_DIR" line="ES_DATA_DIR={{ es_data_dir }}"
+  when: es_data_dir is defined
+  register: elasticsearch_configure
+- name: Debian - configure elasticsearch user
+  lineinfile: dest=/etc/default/elasticsearch regexp="^ES_USER" insertafter="^#ES_USER" line="ES_USER={{ es_user }}"
+  when: es_user is defined
+  register: elasticsearch_configure
+- name: Debian - configure elasticsearch group
+  lineinfile: dest=/etc/default/elasticsearch regexp="^ES_GROUP" insertafter="^#ES_GROUP" line="ES_GROUP={{ es_group }}"
+  when: es_group is defined
+  register: elasticsearch_configure
+- name: Debian - create data dir
+  file: state=directory path={{ es_data_dir }} owner={{ es_user }} group={{ es_group }}
+  when: es_data_dir is defined
diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml
index 04b359c..43eed94 100644
--- a/tasks/elasticsearch-RedHat.yml
+++ b/tasks/elasticsearch-RedHat.yml
@@ -12,3 +12,18 @@
   lineinfile: dest=/etc/default/elasticsearch regexp="^ES_HEAP_SIZE" insertafter="^#ES_HEAP_SIZE" line="ES_HEAP_SIZE={{ es_heap_size }}"
   when: es_heap_size is defined
   register: elasticsearch_configure
+- name: RedHat - configure data store
+  lineinfile: dest=/etc/default/elasticsearch regexp="^ES_DATA_DIR" insertafter="^#ES_DATA_DIR" line="ES_DATA_DIR={{ es_data_dir }}"
+  when: es_data_dir is defined
+  register: elasticsearch_configure
+- name: RedHat - configure elasticsearch user
+  lineinfile: dest=/etc/default/elasticsearch regexp="^ES_USER" insertafter="^#ES_USER" line="ES_USER={{ es_user }}"
+  when: es_user is defined
+  register: elasticsearch_configure
+- name: RedHat - configure elasticsearch group
+  lineinfile: dest=/etc/default/elasticsearch regexp="^ES_GROUP" insertafter="^#ES_GROUP" line="ES_GROUP={{ es_group }}"
+  when: es_group is defined
+  register: elasticsearch_configure
+- name: RedHat - create data dir
+  file: state=directory path={{ es_data_dir }} owner={{ es_user }} group={{ es_group }}
+  when: es_data_dir is defined