diff --git a/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml b/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
index fdc3417..d896414 100644
--- a/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
+++ b/playbooks/roles/filebeat/templates/filebeat-gateway-nginx-template.yml
@@ -1,4 +1,4 @@
-filebeat.registry.path: {{ work_path }}/data/registry/gw-nginx-{{ instance_name }}
+filebeat.registry.path: {{ work_path }}/gw-nginx-{{ instance_name }}_data
 
 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 3a53912..5450665 100644
--- a/playbooks/roles/filebeat/templates/filebeat-manager-template.yml
+++ b/playbooks/roles/filebeat/templates/filebeat-manager-template.yml
@@ -1,4 +1,4 @@
-filebeat.registry.path: {{ work_path }}/data/registry/mgr-cp-{{ instance_name }}
+filebeat.registry.path: {{ work_path }}/mgr-cp-{{ instance_name }}_data
 
 filebeat.inputs:
 {% for log in mgrlogs %}