diff --git a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
index 2ba1e5ccf..77730f169 100644
--- a/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_hieradata/molecule/hieradata_vars/molecule.yml
@@ -191,6 +191,7 @@ provisioner:
             barbican_api_network: ctlplane
             bindnetwork: ctlplane
             ceph_cluster_network: ctlplane
+            ceph_dashboard_network: ctlplane
             ceph_grafana_network: ctlplane
             ceph_mon_network: ctlplane
             ceph_rgw_network: ctlplane
diff --git a/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2
index 99571cbde..64694fd4c 100644
--- a/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2
+++ b/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2
@@ -8,16 +8,8 @@
 {%   set _ = vip_data.__setitem__('internal_api_virtual_ip', (net_vip_map[networks['InternalApi']['name_lower']])) %}
 {% endif %}
 {% set _ = vip_data.__setitem__('network_virtual_ips', network_virtual_ips) %}
-{# when ceph monitoring stack is enabled the frontend vip is explicitly set according to CephDashboardNetwork #}
-{% if 'ceph_grafana' in enabled_services %}
-{%     set _ = vip_data.__setitem__('ceph_dashboard_vip', (net_vip_map[service_net_map['ceph_dashboard_network']])) %}
-{% endif %}
+{% set _ = vip_data.__setitem__('ceph_dashboard_vip', (net_vip_map[service_net_map['ceph_dashboard_network']])) %}
 {% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[service_net_map['ganesha_network']])) %}
-{% for network in enabled_networks %}
-{%   if network == 'StorageDashboard' %}
-{%     set _ = vip_data.__setitem__('ceph_dashboard_vip', (net_vip_map[networks['StorageDashboard']['name_lower']])) %}
-{%   endif %}
-{% endfor %}
 {# public_virtual_ip and controller_virtual_ip are needed in both HAproxy & keepalived. #}
 {% set _ = vip_data.__setitem__('tripleo::haproxy::public_virtual_ip', (net_vip_map[service_net_map['public_network']])) %}
 {% set _ = vip_data.__setitem__('tripleo::keepalived::public_virtual_ip', (net_vip_map[service_net_map['public_network']])) %}