diff --git a/roles/db/tasks/startcluster.yml b/roles/db/tasks/startcluster.yml
index f062d32..f4e3e75 100644
--- a/roles/db/tasks/startcluster.yml
+++ b/roles/db/tasks/startcluster.yml
@@ -12,9 +12,9 @@
   action: shell mysql -e "CREATE USER 'haproxy_check'@'%'; FLUSH PRIVILEGES;"
 
 - name: Set up user for wrestlingtourney
-  action: shell mysql -e "CREATE USER 'heroku_jcw'@'%' IDENTIFIED BY '$heroku_jcw_password';GRANT ALL PRIVILEGES ON wrestlingtourney.* TO 'heroku_jcw'@'%'; FLUSH PRIVILEGES;"
+  action: shell mysql -e "CREATE USER 'heroku_jcw'@'%' IDENTIFIED BY '{{ heroku_jcw_password }}';GRANT ALL PRIVILEGES ON wrestlingtourney.* TO 'heroku_jcw'@'%'; FLUSH PRIVILEGES;"
 
 - name:  set mysql root password
-  action: shell mysql -e "UPDATE mysql.user SET password=PASSWORD('$root_mysql_password') where user='root'; FLUSH PRIVILEGES;" 
+  action: shell mysql -e "UPDATE mysql.user SET password=PASSWORD('{{ root_mysql_password }}') where user='root'; FLUSH PRIVILEGES;" 
 
 
diff --git a/roles/db/templates/my.cnf.j2 b/roles/db/templates/my.cnf.j2
index 91b7dc8..2445fad 100644
--- a/roles/db/templates/my.cnf.j2
+++ b/roles/db/templates/my.cnf.j2
@@ -109,7 +109,7 @@ max_binlog_size         = 100M
 
 # Galera settings
 wsrep_cluster_name=wrestlingdev
-wsrep_cluster_address=gcomm://{% for host in groups['db'] %}{{ hostvars[host]['ansible_eth1']['ipv4']['address'] }},{% endfor %}
+wsrep_cluster_address=gcomm://{% for host in groups['db'] %}{{ hostvars[host]['ansible_eth1']['ipv4']['address'] }}{% endfor %}
 wsrep_sst_method=rsync
 wsrep_node_address={{ ansible_eth1["ipv4"]["address"] }}
 
diff --git a/roles/proxy/templates/haproxy.cfg.j2 b/roles/proxy/templates/haproxy.cfg.j2
index 75bcd64..a3905c0 100644
--- a/roles/proxy/templates/haproxy.cfg.j2
+++ b/roles/proxy/templates/haproxy.cfg.j2
@@ -28,7 +28,7 @@ listen mysql-cluster
 frontend www-http
    bind 0.0.0.0:80
    reqadd X-Forwarded-Proto:\ http
-   default_backend www-backend
+   default_backend wrestlingdev
 
 frontend www-https
    bind 0.0.0.0:443 ssl crt /root/server.pem