diff --git a/defaults/main.yml b/defaults/main.yml
index df1e1d0b..7953afe1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -242,8 +242,8 @@ nova_novncproxy_port: 6080
 nova_novncproxy_host: "{{ openstack_service_bind_address | default('0.0.0.0') }}"
 nova_novncproxy_base_uri: "{{ nova_novncproxy_proto }}://{{ external_lb_vip_address }}:{{ nova_novncproxy_port }}"
 nova_novncproxy_base_url: "{{ nova_novncproxy_base_uri }}/vnc_lite.html"
-nova_novncproxy_vncserver_proxyclient_address: "{{ (nova_management_address == 'localhost') | ternary('127.0.0.1', nova_management_address) }}"
-nova_novncproxy_vncserver_listen: "{{ (nova_management_address == 'localhost') | ternary('127.0.0.1', nova_management_address) }}"
+nova_novncproxy_vncserver_proxyclient_address: "{{ _nova_my_ip }}"
+nova_novncproxy_vncserver_listen: "{{ _nova_my_ip }}"
 nova_novncproxy_git_repo: "{{ novncproxy_git_repo | default('https://github.com/novnc/noVNC') }}"
 nova_novncproxy_git_install_branch: "{{ novncproxy_git_install_branch | default('master') }}"
 
@@ -282,7 +282,7 @@ nova_libvirt_inject_partition: -2
 nova_libvirt_inject_password: False
 nova_libvirt_disk_cachemodes: '{{ (nova_libvirt_images_rbd_pool | length > 0) | ternary("network=writeback", "") }}'
 nova_libvirt_hw_disk_discard: '{{ (nova_libvirt_images_rbd_pool | length > 0) | ternary("unmap", "ignore") }}'
-nova_libvirt_live_migration_inbound_addr: '{{ (nova_management_address == "localhost") | ternary("127.0.0.1", nova_management_address) }}'
+nova_libvirt_live_migration_inbound_addr: '{{ _nova_my_ip }}'
 
 ## Nova console
 # Set the console type. Presently the only options are ["spice", "novnc", "serialconsole", "disabled"].
@@ -596,7 +596,7 @@ nova_pki_compute_certificates:
   - name: "nova_{{ ansible_facts['hostname'] }}"
     provider: ownca
     cn: "{{ ansible_facts['nodename'] }}"
-    san: "{{ 'DNS:' ~ ansible_facts['hostname'] ~ ',DNS:' ~ ansible_facts['nodename'] ~ ',IP:' ~ (nova_management_address == 'localhost') | ternary('127.0.0.1', nova_management_address) }}"
+    san: "{{ 'DNS:' ~ ansible_facts['hostname'] ~ ',DNS:' ~ ansible_facts['nodename'] ~ ',IP:' ~ _nova_my_ip }}"
     signed_by: "{{ nova_pki_intermediate_cert_name }}"
     key_usage:
       - digitalSignature
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 8c538d66..9419bcc9 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -33,7 +33,7 @@ enabled_apis = {{ nova_enabled_apis }}
 transport_url = {{ nova_oslomsg_rpc_transport }}://{% for host in nova_oslomsg_rpc_servers.split(',') %}{{ nova_oslomsg_rpc_userid }}:{{ nova_oslomsg_rpc_password }}@{{ host }}:{{ nova_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ nova_oslomsg_rpc_vhost }}{% if nova_oslomsg_rpc_use_ssl | bool %}?ssl=1&ssl_version={{ nova_oslomsg_rpc_ssl_version }}&ssl_ca_file={{ nova_oslomsg_rpc_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
 
 # Network
-my_ip = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
+my_ip = {{ _nova_my_ip }}
 
 # Hypervisor
 default_ephemeral_format = ext4
@@ -86,12 +86,9 @@ agent_enabled = {{ nova_spice_console_agent_enabled }}
 enabled = True
 # Console Url and binds
 html5proxy_base_url = {{ nova_spice_html5proxy_base_url }}
-html5proxy_host = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
-
-server_listen = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
-
-server_proxyclient_address = {% if nova_management_address == 'localhost' %}127.0.0.1{% else %}{{ nova_management_address }}{% endif %}
-
+html5proxy_host = {{ _nova_my_ip }}
+server_listen = {{ _nova_my_ip }}
+server_proxyclient_address = {{ _nova_my_ip }}
 
 [vnc]
 enabled = False
@@ -117,7 +114,7 @@ vencrypt_ca_certs={{ nova_vencrypt_ca_certs }}
 enabled = True
 # Console Url and binds
 base_url= {{ nova_serialconsoleproxy_base_url }}
-proxyclient_address = {% if nova_management_address == 'localhost' +%}127.0.0.1{% else +%}{{ nova_management_address }}{% endif +%}
+proxyclient_address = {{ _nova_my_ip }}
 port_range = {{ nova_serialconsoleproxy_port_range }}
 {% if nova_services['nova-serialconsole-proxy']['group'] %}
 serialproxy_host= {{ nova_serialconsoleproxy_serialconsole_proxyserver_proxyclient_address }}
diff --git a/vars/main.yml b/vars/main.yml
index e2110bee..82904c14 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -112,6 +112,8 @@ nova_core_files:
     group: "{{ nova_system_group_name }}"
     mode: "0640"
 
+_nova_my_ip: "{{ (nova_management_address == 'localhost') | ternary('127.0.0.1', nova_management_address) }}"
+
 _nova_scheduler_filters: |-
   {% set default_filters = nova_scheduler_default_filters %}
   {% if default_filters is not iterable and default_filters is string %}