diff --git a/tasks/exporter/apache.yml b/tasks/exporter/apache.yml
index 9df2248..e0efbd1 100644
--- a/tasks/exporter/apache.yml
+++ b/tasks/exporter/apache.yml
@@ -1,3 +1,3 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_apache']
+  tags: ['prometheus_apache_exporter']
diff --git a/tasks/exporter/blackbox.yml b/tasks/exporter/blackbox.yml
index e1c4933..f779bfd 100644
--- a/tasks/exporter/blackbox.yml
+++ b/tasks/exporter/blackbox.yml
@@ -1,6 +1,6 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_blackbox']
+  tags: ['prometheus_blackbox_exporter']
 
 - name: 'blackbox exporter | configuration'
   template:
@@ -12,3 +12,4 @@
   register: prometheus_blackbox_exporter_configuration
   notify:
     - 'prometheus | blackbox exporter | restart service'
+  tags: ['prometheus_blackbox_exporter']
diff --git a/tasks/exporter/memcached.yml b/tasks/exporter/memcached.yml
index 7e3a8f8..263453e 100644
--- a/tasks/exporter/memcached.yml
+++ b/tasks/exporter/memcached.yml
@@ -1,3 +1,3 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_memcached']
+  tags: ['prometheus_memcached_exporter']
diff --git a/tasks/exporter/mongodb.yml b/tasks/exporter/mongodb.yml
index ebadc66..899ad91 100644
--- a/tasks/exporter/mongodb.yml
+++ b/tasks/exporter/mongodb.yml
@@ -1,6 +1,6 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_mongodb']
+  tags: ['prometheus_mongodb_exporter']
 
 - name: 'mongodb exporter < v0.2 | move to /usr/local/bin'
   copy:
@@ -14,6 +14,7 @@
     - 'prometheus | mongodb exporter | restart service'
   when:
     - prometheus_mongodb_exporter_latest_version.stdout < '0.2'
+  tags: ['prometheus_mongodb_exporter']
 
 - name: 'mongodb exporter | configuration'
   template:
@@ -24,3 +25,4 @@
     mode: 0600
   notify:
     - 'prometheus | mongodb exporter | restart service'
+  tags: ['prometheus_mongodb_exporter']
diff --git a/tasks/exporter/mysqld.yml b/tasks/exporter/mysqld.yml
index dcb42e7..b151f4d 100644
--- a/tasks/exporter/mysqld.yml
+++ b/tasks/exporter/mysqld.yml
@@ -1,6 +1,6 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_mysqld']
+  tags: ['prometheus_mysqld_exporter']
 
 - name: 'mysqld exporter | configuration'
   template:
@@ -14,3 +14,4 @@
   register: prometheus_mysqld_exporter_configuration
   notify:
     - 'prometheus | mysqld exporter | restart service'
+  tags: ['prometheus_mysqld_exporter']
diff --git a/tasks/exporter/node.yml b/tasks/exporter/node.yml
index 8b9e233..417928c 100644
--- a/tasks/exporter/node.yml
+++ b/tasks/exporter/node.yml
@@ -1,3 +1,3 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_node']
+  tags: ['prometheus_node_exporter']
diff --git a/tasks/exporter/opcache.yml b/tasks/exporter/opcache.yml
index 284d727..d55e823 100644
--- a/tasks/exporter/opcache.yml
+++ b/tasks/exporter/opcache.yml
@@ -1,6 +1,6 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_opcache']
+  tags: ['prometheus_opcache_exporter']
 
 - name: 'opcache exporter | configuration'
   template:
@@ -12,3 +12,4 @@
   register: prometheus_opcache_exporter_configuration
   notify:
     - 'prometheus | opcache exporter | restart service'
+  tags: ['prometheus_opcache_exporter']
diff --git a/tasks/exporter/phpfpm.yml b/tasks/exporter/phpfpm.yml
index 5b58e5a..509cf69 100644
--- a/tasks/exporter/phpfpm.yml
+++ b/tasks/exporter/phpfpm.yml
@@ -1,6 +1,6 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_phpfpm']
+  tags: ['prometheus_phpfpm_exporter']
 
 - name: 'phpfpm exporter | install startup script'
   template:
@@ -11,3 +11,4 @@
     mode: 0600
   notify:
     - 'prometheus | phpfpm exporter | restart service'
+  tags: ['prometheus_phpfpm_exporter']
diff --git a/tasks/exporter/postgresql.yml b/tasks/exporter/postgresql.yml
index f6de9c2..abaa489 100644
--- a/tasks/exporter/postgresql.yml
+++ b/tasks/exporter/postgresql.yml
@@ -1,6 +1,6 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_postgres']
+  tags: ['prometheus_postgres_exporter']
 
 - name: 'postgres exporter | configuration'
   template:
@@ -12,3 +12,4 @@
   register: prometheus_postgres_exporter_configuration
   notify:
     - 'prometheus | postgres exporter | restart service'
+  tags: ['prometheus_postgres_exporter']
diff --git a/tasks/exporter/redis.yml b/tasks/exporter/redis.yml
index bb287ab..e3eed1f 100644
--- a/tasks/exporter/redis.yml
+++ b/tasks/exporter/redis.yml
@@ -1,6 +1,6 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_redis']
+  tags: ['prometheus_redis_exporter']
 
 - name: 'redis exporter | configuration'
   template:
@@ -12,3 +12,4 @@
   register: prometheus_redis_exporter_configuration
   notify:
     - 'prometheus | redis exporter | restart service'
+  tags: ['prometheus_redis_exporter']
diff --git a/tasks/exporter/varnish.yml b/tasks/exporter/varnish.yml
index 9de2625..3c31843 100644
--- a/tasks/exporter/varnish.yml
+++ b/tasks/exporter/varnish.yml
@@ -1,3 +1,3 @@
 ---
 - include_tasks: _common.yml
-  tags: ['prometheus_varnish']
+  tags: ['prometheus_varnish_exporter']