diff --git a/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml b/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
index d896414..ea9c206 100644
--- a/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
+++ b/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
@@ -1,4 +1,5 @@
-filebeat.registry.path: {{ work_path }}/gw-nginx-{{ instance_name }}_data
+path.data: {{ work_path }}/data
+filebeat.registry.path: {{ work_path }}/data/registry/gw-nginx-{{ instance_name }}
 
 filebeat.inputs:
 {% for log in gwlogs %}
diff --git a/playbooks/roles/filebeat/templates/filebeat-manager-template.yml b/playbooks/roles/filebeat/templates/filebeat-manager-template.yml
index 5450665..b9a0a0f 100644
--- a/playbooks/roles/filebeat/templates/filebeat-manager-template.yml
+++ b/playbooks/roles/filebeat/templates/filebeat-manager-template.yml
@@ -1,4 +1,5 @@
-filebeat.registry.path: {{ work_path }}/mgr-cp-{{ instance_name }}_data
+path.data: {{ work_path }}/data2
+filebeat.registry.path: {{ work_path }}/data2/registry/mgr-cp-{{ instance_name }}
 
 filebeat.inputs:
 {% for log in mgrlogs %}