diff --git a/roles/maxscale/templates/keepalived.conf.j2 b/roles/maxscale/templates/keepalived.conf.j2
index ed9a5e9..38dd78e 100644
--- a/roles/maxscale/templates/keepalived.conf.j2
+++ b/roles/maxscale/templates/keepalived.conf.j2
@@ -16,23 +16,22 @@ vrrp_script check_maxscale {
 vrrp_instance {{ vip.name }} {
     interface         {{ k.interface }}
     state             BACKUP
-    priority {{ k.priorities.master if vip.host == inventory_hostname_short else k.priorities.backup }}
+    priority          {{ k.priorities.master if vip.host == inventory_hostname else k.priorities.backup }}
     virtual_router_id {{ vip.vrid }}
     advert_int        1
     accept
-    unicast_src_ip    {{ ansible_host }}
+    unicast_src_ip    {{ ansible_default_ipv4.address }}
 
     unicast_peer {
-{% for peer in k.peers if peer.host != inventory_hostname %}
+{% for peer in k.peers %}
+{% if peer.host != inventory_hostname %}
         {{ peer.ip }}
+{% endif %}
 {% endfor %}
     }
-
-
     virtual_ipaddress {
         {{ vip.vip }}
     }
-
     track_script {
         check_maxscale
     }