diff --git a/tasks/main.yml b/tasks/main.yml
index a6b75692187f3966003f55c32f8c787bdc8da1ff..c9bb3f0f095dfbf02ae90d2c639aeb9358351235 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -23,7 +23,7 @@
     when: groups['proxyserver'] is defined and inventory_hostname in groups['proxyserver']
 
   - import_tasks: mysql.yml
-    when: groups['dbserver-mysql'] is defined and inventory_hostname in groups['dbserver-mysql']
+    when: groups['dbserver_mysql'] is defined and inventory_hostname in groups['dbserver_mysql']
 
   - import_tasks: silent.yml
 
diff --git a/templates/python.d.conf b/templates/python.d.conf
index 8f3898f4ecdce36d5bf5eae7ff526ff875a2798e..d95c3f1328346e50c0c5407f009677f4efe71c0d 100644
--- a/templates/python.d.conf
+++ b/templates/python.d.conf
@@ -64,7 +64,7 @@ mdstat: yes
 memcached: {{ (groups['webserver'] is defined and inventory_hostname in groups['webserver'])|ternary("yes", "no") }}
 mongodb: {{ ((groups['dbserver-mongodb'] is defined and inventory_hostname in groups['dbserver-mongodb']) or (groups['uptime'] is defined and inventory_hostname in groups['uptime']))|ternary("yes", "no") }}
 monit: no
-mysql: {{ (groups['dbserver-mysql'] is defined and inventory_hostname in groups['dbserver-mysql'])|ternary("yes", "no") }}
+mysql: {{ (groups['dbserver_mysql'] is defined and inventory_hostname in groups['dbserver_mysql'])|ternary("yes", "no") }}
 nginx: no
 nginx_log: no
 nginx_plus: no