diff --git a/playbooks/roles/filebeat/files/filebeat_monitor b/playbooks/roles/filebeat/files/filebeat_monitor
index ff19cf1..bd1997e 100755
Binary files a/playbooks/roles/filebeat/files/filebeat_monitor and b/playbooks/roles/filebeat/files/filebeat_monitor differ
diff --git a/playbooks/roles/filebeat/templates/filebeat_monitor.yaml b/playbooks/roles/filebeat/templates/filebeat_monitor.yaml
index 2bf592e..210dec7 100644
--- a/playbooks/roles/filebeat/templates/filebeat_monitor.yaml
+++ b/playbooks/roles/filebeat/templates/filebeat_monitor.yaml
@@ -1,14 +1,7 @@
-project_id: {{ instance_name }}
+project: {{ instance_name }}
 sublog: {{ log_type }}
-elastic_hosts: {{ filebeat_logs[log_type]['es_hosts'] }}
-elastic_indice_name: {{ filebeat_logs[log_type]['index_prefix'] }}-{{ instance_name }}-*
-{% if filebeat_logs[log_type]['es_user'] and filebeat_logs[log_type]['es_passwd'] -%}
-elastic_username: {{ filebeat_logs[log_type]['es_user'] }}
-elastic_password: {{ filebeat_logs[log_type]['es_passwd'] }}
-{% endif -%}
-elastic_search_lifecycle: {{ filebeat_monitor_lifecycle | default(30) }}
-http_unix_sock: {{ filebeat_monitor_sock | default('./filebeat_monitor.sock') }}
-prometheus_push_gateway_url: {{ filebeat_monitor_push_gateway | default('') }}
-prometheus_push_gateway_job: {{ filebeat_monitor_push_job | default('filebeat') }}
-prometheus_push_lifecycle: {{ filebeat_monitor_push_lifecycle | default(5) }}
+filebeat_config_path: {{ filebeat_logs[log_type]['filebeat_config_path'] | default('filebeat.yml') }}
+metric_host: {{ filebeat_monitor_sock | default('./filebeat_monitor.sock') }}
+push_gateway_url: {{ filebeat_monitor_push_gateway | default('') }}
+push_gateway_lifecycle: {{ filebeat_monitor_push_lifecycle | default(5) }}
 log_path: {{ filebeat_monitor_log_path | default('logs/filebeat_monitor.log') }}
\ No newline at end of file