1 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/high-availability/keepalived.conf.j2 b/data/templates/high-availability/keepalived.conf.j2
index bcd92358f..d54f575b5 100644
--- a/data/templates/high-availability/keepalived.conf.j2
+++ b/data/templates/high-availability/keepalived.conf.j2
@@ -25,9 +25,9 @@ global_defs {
 {%     if vrrp.global_parameters.garp.master_repeat is vyos_defined %}
     vrrp_garp_master_repeat {{ vrrp.global_parameters.garp.master_repeat }}
 {%     endif %}
-{%     if vrrp.global_parameters.version is vyos_defined %}
+{% endif %}
+{% if vrrp.global_parameters.version is vyos_defined %}
     vrrp_version {{ vrrp.global_parameters.version }}
-{%     endif %}
 {% endif %}
     notify_fifo /run/keepalived/keepalived_notify_fifo
     notify_fifo_script /usr/libexec/vyos/system/keepalived-fifo.py
@@ -173,7 +173,7 @@ vrrp_sync_group {{ name }} {
 {%     for vserver, vserver_config in virtual_server.items() %}
 # Vserver {{ vserver }}
 {%         if vserver_config.port is vyos_defined %}
-virtual_server {{ vserver }} {{ vserver_config.port }} {
+virtual_server {{ vserver_config.address }} {{ vserver_config.port }} {
 {%         else %}
 virtual_server fwmark {{ vserver_config.fwmark }} {
 {%         endif %}