diff --git a/elk_metrics_6x/installMetricbeat.yml b/elk_metrics_6x/installMetricbeat.yml
index 3c98e526..defc8454 100644
--- a/elk_metrics_6x/installMetricbeat.yml
+++ b/elk_metrics_6x/installMetricbeat.yml
@@ -89,6 +89,7 @@
         rabbitmq_enabled: "{{ rabbitmq.stat.exists | bool }}"
         uwsgi_enabled: "{{ uwsgi.stat.exists | bool }}"
 
+    # Apache 2 stats enablement
     - name: Drop apache2 stats site config
       template:
         src: apache-status.conf.j2
@@ -114,6 +115,26 @@
         state: reloaded
       when: apache_enabled
 
+    # NGINX stats enablement
+    - name: Drop nginx stats site config
+      template:
+        src: nginx-status.conf.j2
+        dest: /etc/nginx/sites-available/nginx-status.conf
+      when: nginx_enabled
+
+    - name: Enable nginx stats site
+      file:
+        src: /etc/nginx/sites-available/nginx-status.conf
+        dest: /etc/nginx/sites-enabled/nginx-status.conf
+        state: link
+      when: nginx_enabled
+
+    - name: Reload nginx
+      service:
+        name: nginx
+        state: reloaded
+      when: nginx_enabled
+
   post_tasks:
     - name: Drop metricbeat conf file
       template:
diff --git a/elk_metrics_6x/templates/metricbeat.yml.j2 b/elk_metrics_6x/templates/metricbeat.yml.j2
index 9832f1b0..90cb8882 100644
--- a/elk_metrics_6x/templates/metricbeat.yml.j2
+++ b/elk_metrics_6x/templates/metricbeat.yml.j2
@@ -372,7 +372,7 @@ metricbeat.modules:
   period: 30s
 
   # Nginx hosts
-  hosts: ["http://127.0.0.1"]
+  hosts: ["http://{{ ansible_hostname }}"]
 
   # Path to server status. Default server-status
   server_status_path: "server-status"
diff --git a/elk_metrics_6x/templates/nginx-status.conf.j2 b/elk_metrics_6x/templates/nginx-status.conf.j2
new file mode 100644
index 00000000..a698f065
--- /dev/null
+++ b/elk_metrics_6x/templates/nginx-status.conf.j2
@@ -0,0 +1,9 @@
+server {
+    listen 127.0.1.1:80;
+    location /server-status {
+        stub_status on;
+        access_log off;
+        allow 127.0.0.0/8;
+        deny all;
+    }
+}