diff --git a/roles/libvirt/setup/undercloud/defaults/main.yml b/roles/libvirt/setup/undercloud/defaults/main.yml
index cf100dfe6..567eeb5dc 100644
--- a/roles/libvirt/setup/undercloud/defaults/main.yml
+++ b/roles/libvirt/setup/undercloud/defaults/main.yml
@@ -6,4 +6,3 @@ undercloud_custom_vmlinuz: "{{ working_dir }}/overcloud-full.vmlinuz"
 undercloud_custom_initrd: "{{ working_dir }}/overcloud-full.initrd"
 
 ssh_tunnel_service_file: ssh-tunnel.service.j2
-ssh_tunnel_target_ip: "{{ undercloud_network_cidr|nthhost(1) }}"
diff --git a/roles/libvirt/setup/undercloud/templates/ssh-tunnel.service.j2 b/roles/libvirt/setup/undercloud/templates/ssh-tunnel.service.j2
index 95b4f5a02..c28d4b279 100644
--- a/roles/libvirt/setup/undercloud/templates/ssh-tunnel.service.j2
+++ b/roles/libvirt/setup/undercloud/templates/ssh-tunnel.service.j2
@@ -1,3 +1,5 @@
+{% set ssh_tunnel_target_ip = "https://%s" % undercloud_network_cidr|nthhost(2)  if undercloud_generate_service_certificate|bool else "http://%s:3000" % undercloud_network_cidr|nthhost(1) %}
+
 [Unit]
 Description=Set up ssh tunneling for TripleO
 After=network.target