diff --git a/AnsiblePlaybooks/Ubuntu-12.04/MySQL_MHA_PalominoClusterToolTemplate.ini b/AnsiblePlaybooks/Ubuntu-12.04/MySQL_MHA_PalominoClusterToolTemplate.ini
index 133d684..88f420e 100644
--- a/AnsiblePlaybooks/Ubuntu-12.04/MySQL_MHA_PalominoClusterToolTemplate.ini
+++ b/AnsiblePlaybooks/Ubuntu-12.04/MySQL_MHA_PalominoClusterToolTemplate.ini
@@ -7,8 +7,8 @@
 # master/slaves configuration assuming you have 8 database
 # hosts on 10.31.41.22[1-8]
 
-# Common to all clusters
-# ======================
+# Common to All Cluster Types
+# ===========================
 
 # Alerting/Trending -----
 [alertmaster]
@@ -56,9 +56,14 @@ repl_user=repl
 repl_password=CHANGEME_palominoReplPassword
 
 
+# Administrativa
+# ==============
+
 # All PalominoClusterNodes -----
 [palominoclusternodes:children]
+alertmaster
 alertnodes
+trendmaster
 trendnodes
 mhamanager
 mysqlmasters
diff --git a/AnsiblePlaybooks/Ubuntu-12.04/Zabbix/playbooks/10-setupZabbix.yml b/AnsiblePlaybooks/Ubuntu-12.04/Zabbix/playbooks/10-setupZabbix.yml
index 8a93887..1ed7ba0 100644
--- a/AnsiblePlaybooks/Ubuntu-12.04/Zabbix/playbooks/10-setupZabbix.yml
+++ b/AnsiblePlaybooks/Ubuntu-12.04/Zabbix/playbooks/10-setupZabbix.yml
@@ -47,11 +47,11 @@
    # dbconfig.php has username/password
    # $DB["USER"] = $mysql_Zabbix_user
    - name: give zabbix db username
-     action: lineinfile name=/etc/zabbix/dbconfig.php regexp=^$DB["USER"] line='$DB["USER"] = "$mysql_Zabbix_user"'
+     action: lineinfile name=/etc/zabbix/dbconfig.php regexp='^\$DB\[\"USER\"\]' line='$DB["USER"] = "$mysql_Zabbix_user";'
 
    # $DB["PASSWORD"] = $mysql_Zabbix_password
    - name: give zabbix db password
-     action: lineinfile name=/etc/zabbix/dbconfig.php regexp=^$DB["PASSWORD"] line='$DB["PASSWORD"] = "$mysql_Zabbix_password"'
+     action: lineinfile name=/etc/zabbix/dbconfig.php regexp='^\$DB\[\"PASSWORD\"\]' line='$DB["PASSWORD"] = "$mysql_Zabbix_password";'
 
 
 # install Zabbix agents across the monitored cluster