diff --git a/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml b/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml
index 79c274725..f103fc23d 100644
--- a/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/molecule.yml
+++ b/tripleo_ansible/roles/tripleo-hieradata/molecule/ansible_hieradata/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/molecule/hieradata_vars/molecule.yml b/tripleo_ansible/roles/tripleo-hieradata/molecule/hieradata_vars/molecule.yml
index a3fe7d15c..700c2f3c6 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 fd0b8efc8..668b28cb0 100644
--- a/tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2
+++ b/tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2
@@ -12,10 +12,6 @@
 {%   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 %}
 {% for network in enabled_networks %}
 {%   if network == 'StorageNFS' %}
 {%     set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['StorageNFS']['name_lower']])) %}
@@ -25,10 +21,8 @@
 {%     set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['External']['name_lower']])) %}
 {%   endif %}
 {% endif %}
-{%   if network == 'StorageDashboard' %}
-{%     set _ = vip_data.__setitem__('ceph_dashboard_vip', (net_vip_map[networks['StorageDashboard']['name_lower']])) %}
-{%   endif %}
 {% endfor %}
+{% set _ = vip_data.__setitem__('ceph_dashboard_vip', (net_vip_map[service_net_map['ceph_dashboard_network']])) %}
 {# public_virtual_ip and controller_virtual_ip are needed in both HAproxy & keepalived. #}
 {% if 'External' in enabled_networks %}
 {%   set _ = vip_data.__setitem__('tripleo::haproxy::public_virtual_ip', (net_vip_map[networks['External']['name_lower']])) %}