diff --git a/xtrabackup/meta/salt.yml b/xtrabackup/meta/salt.yml
index 36c32d3..31a4cfd 100644
--- a/xtrabackup/meta/salt.yml
+++ b/xtrabackup/meta/salt.yml
@@ -5,7 +5,7 @@
 {%- if ips %}
   {%- for ip in ips %}
     {%- if not (ip|string).startswith('127.')  %}
-    {%- do addresses.append('- ' + ip) %}
+    {%- do addresses.append(ip) %}
     {%- endif %}
   {%- endfor %}
 {%- endif %}
@@ -14,10 +14,7 @@
   xtrabackup:
     xtrabackup:
       client:
-        addresses:
-        {%- for address in addresses %}
-          {{ address }}
-        {%- endfor %}
+        addresses: {{ addresses|yaml }}
 {%- endif %}
 
 {%- endif %}
diff --git a/xtrabackup/server.sls b/xtrabackup/server.sls
index 5ec95a9..876e26f 100644
--- a/xtrabackup/server.sls
+++ b/xtrabackup/server.sls
@@ -48,7 +48,7 @@
 
 {%- set clients = [] %}
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
-{%- if node_grains.get('xtrabackup') and node_grains.xtrabackup.get('client') %}
+{%- if node_grains.get('xtrabackup', {}).get('client') %}
 {%- set client = node_grains.xtrabackup.get("client") %}
 {%- if client.get('addresses') and client.get('addresses', []) is iterable %}
 {%- for address in client.addresses %}