diff --git a/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml b/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml
index 824a770d..b442898c 100644
--- a/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml
+++ b/elk_metrics_7x/roles/elastic_filebeat/tasks/main.yml
@@ -84,6 +84,7 @@
     logstash_enabled: "{{ ((ansible_facts.services['logstash.service'] | default({}) )['state'] | default('')) == 'running' }}"
     kibana_enabled: "{{ ((ansible_facts.services['kibana.service'] | default({}) )['state'] | default('')) == 'running' }}"
     haproxy_enabled: "{{ ((ansible_facts.services['haproxy.service'] | default({}) )['state'] | default('')) == 'running' }}"
+    nginx_enabled: "{{ ((ansible_facts.services['nginx.service'] | default({}) )['state'] | default('')) == 'running' }}"
 
 - name: Drop Filebeat conf file
   template:
diff --git a/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2 b/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2
index 45de01df..750e7833 100644
--- a/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2
+++ b/elk_metrics_7x/roles/elastic_filebeat/templates/filebeat.yml.j2
@@ -324,6 +324,10 @@ filebeat.modules:
     var.paths:
       - /openstack/log/*repo_container*/nginx/*access.log
       - /openstack/log/*keystone*/nginx/*access.log
+{% if (nginx_enabled | default(false) | bool ) %}
+      - var/log/nginx/*access.log
+{% endif %}
+
     # Input configuration (advanced). Any input configuration option
     # can be added under this section.
     #input:
@@ -340,6 +344,9 @@ filebeat.modules:
     var.paths:
       - /openstack/log/*repo_container*/nginx/*error.log
       - /openstack/log/*keystone*/nginx/*error.log
+{% if (nginx_enabled | default(false) | bool ) %}
+      - var/log/nginx/*error.log
+{% endif %}
 
     # Input configuration (advanced). Any input configuration option
     # can be added under this section.