diff --git a/README.md b/README.md
index 9901f57..d6bbc5a 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,6 @@ Collection available here: **[https://awesome-prometheus-alerts.grep.to](https:/
 - [Prometheus internals](https://awesome-prometheus-alerts.grep.to/rules#prometheus-internals)
 - [Host/Hardware](https://awesome-prometheus-alerts.grep.to/rules#host-and-hardware)
 - [Docker Containers](https://awesome-prometheus-alerts.grep.to/rules#docker-containers)
-- [Nginx](https://awesome-prometheus-alerts.grep.to/rules#nginx)
 - [RabbitMQ](https://awesome-prometheus-alerts.grep.to/rules#rabbitmq)
 - [MySQL](https://awesome-prometheus-alerts.grep.to/rules#mysql)
 - [PostgreSQL](https://awesome-prometheus-alerts.grep.to/rules#postgresql)
@@ -25,6 +24,7 @@ Collection available here: **[https://awesome-prometheus-alerts.grep.to](https:/
 - [MongoDB](https://awesome-prometheus-alerts.grep.to/rules#mongodb)
 - [Elasticsearch](https://awesome-prometheus-alerts.grep.to/rules#elasticsearch)
 - [Cassandra](https://awesome-prometheus-alerts.grep.to/rules#cassandra)
+- [Nginx](https://awesome-prometheus-alerts.grep.to/rules#nginx)
 - [Apache](https://awesome-prometheus-alerts.grep.to/rules#apache)
 - [HaProxy](https://awesome-prometheus-alerts.grep.to/rules#haproxy)
 - [Traefik](https://awesome-prometheus-alerts.grep.to/rules#traefik)
diff --git a/_data/rules.yml b/_data/rules.yml
index 5368371..bb4f0ef 100644
--- a/_data/rules.yml
+++ b/_data/rules.yml
@@ -167,20 +167,6 @@ services:
             query: "(sum(container_fs_io_current) BY (instance, name) * 100) > 80"
             severity: warning
 
-  - name: Nginx
-    exporters:
-      - name: nginx-lua-prometheus
-        doc_url: https://github.com/knyar/nginx-lua-prometheus
-        rules:
-          - name: HTTP errors 4xx
-            description: Too many HTTP requests with status 4xx (> 5%)
-            query: 'sum(rate(nginx_http_requests_total{status=~"^4.."}[1m])) / sum(rate(nginx_http_requests_total[1m])) * 100 > 5'
-            severity: error
-          - name: HTTP errors 5xx
-            description: Too many HTTP requests with status 5xx (> 5%)
-            query: 'sum(rate(nginx_http_requests_total{status=~"^5.."}[1m])) / sum(rate(nginx_http_requests_total[1m])) * 100 > 5'
-            severity: error
-
   - name: RabbitMQ
     exporters:
       - name: kbudde/rabbitmq-exporter
@@ -475,13 +461,33 @@ services:
             query: 'changes(cassandra_stats{name="org:apache:cassandra:metrics:storage:exceptions:count"}[1m]) > 1'
             severity: error
 
+  - name: Nginx
+    exporters:
+      - name: nginx-lua-prometheus
+        doc_url: https://github.com/knyar/nginx-lua-prometheus
+        rules:
+          - name: HTTP errors 4xx
+            description: Too many HTTP requests with status 4xx (> 5%)
+            query: 'sum(rate(nginx_http_requests_total{status=~"^4.."}[1m])) / sum(rate(nginx_http_requests_total[1m])) * 100 > 5'
+            severity: error
+          - name: HTTP errors 5xx
+            description: Too many HTTP requests with status 5xx (> 5%)
+            query: 'sum(rate(nginx_http_requests_total{status=~"^5.."}[1m])) / sum(rate(nginx_http_requests_total[1m])) * 100 > 5'
+            severity: error
+
   - name: Apache
     exporters:
       - name: Lusitaniae/apache_exporter
         doc_url: https://github.com/Lusitaniae/apache_exporter
         rules:
 
-  - name: HaProxy
+  - name: HaProxy v2.*
+    exporters:
+      - name: Embedded exporter
+        doc_url: https://github.com/haproxy/haproxy/tree/master/contrib/prometheus-exporter
+        rules:
+
+  - name: HaProxy v1.*
     exporters:
       - name: prometheus/haproxy_exporter
         doc_url: https://github.com/prometheus/haproxy_exporter
@@ -489,7 +495,9 @@ services:
 
   - name: Traefik v1.*
     exporters:
-      - rules:
+      - name: Embedded exporter
+        doc_url: https://docs.traefik.io/v1.7/configuration/metrics/
+        rules:
           - name: Traefik backend down
             description: All Traefik backends are down
             query: "count(traefik_backend_server_up) by (backend) == 0"
@@ -499,6 +507,12 @@ services:
             query: 'sum(rate(traefik_backend_requests_total{code=~"5.*"}[5m])) by (backend) / sum(rate(traefik_backend_requests_total[5m])) by (backend) > 0.1'
             severity: error
 
+  - name: Traefik v2.*
+    exporters:
+      - name: Embedded exporter
+        doc_url: https://docs.traefik.io/observability/metrics/prometheus/
+        rules:
+
   - name: PHP-FPM
     exporters:
       - name: bakins/php-fpm-exporter