diff --git a/roles/bitbucket_config/default/main.yaml b/roles/bitbucket_config/default/main.yaml
index ed97d53..d370bf2 100644
--- a/roles/bitbucket_config/default/main.yaml
+++ b/roles/bitbucket_config/default/main.yaml
@@ -1 +1,3 @@
 ---
+
+elasticsearch_config_template: {{ atl_product_installation_versioned }}/elasticsearch/config-template/elasticsearch.yml
\ No newline at end of file
diff --git a/roles/bitbucket_config/tasks/main.yml b/roles/bitbucket_config/tasks/main.yml
index f6672b3..0168145 100644
--- a/roles/bitbucket_config/tasks/main.yml
+++ b/roles/bitbucket_config/tasks/main.yml
@@ -29,4 +29,10 @@
     path: "{{ atl_product_installation_versioned }}/bin/set-bitbucket-home.sh"
     block: |
         BITBUCKET_SHARED_HOME="{{ atl_product_home_shared }}"
-        export BITBUCKET_SHARED_HOME
\ No newline at end of file
+        export BITBUCKET_SHARED_HOME
+
+- name: Make sure elasticsearch data isn't stored in ${BITBUCKET_HOME}/shared
+  lineinefile:
+    path: "{{ elasticsearch_config_template }}"
+    line: "  data: ${BITBUCKET_HOME}/search/data"
+    regexp: "^\s{2}data:\s\$\{BITBUCKET_HOME\}\/shared\/search\/data"
\ No newline at end of file