diff --git a/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/prepare.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/prepare.yml
index 9ef421420..fb8db8192 100644
--- a/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/prepare.yml
+++ b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/prepare.yml
@@ -45,21 +45,24 @@
 
 - name: set dashboard_vip variable if dashboard is enabled
   block:
-    - name: get the frontend_dashboard_vip from the overcloud vars
-      command: "hiera -c /etc/puppet/hiera.yaml ceph_dashboard_vip"
-      register: frontend_vip
-      become: true
-      delegate_to: "{{ groups['mgrs'][0] }}"
     - name: set dashboard_frontend variable
       set_fact:
-        ceph_ansible_group_vars_all: "{{ ceph_ansible_group_vars_all | combine({ 'dashboard_frontend_vip': dashboard_vip | default() }) }}"
+        ceph_ansible_group_vars_all: "{{ ceph_ansible_group_vars_all | combine({ 'dashboard_frontend_vip': dashboard_vip | default() })
+                                     | combine({ 'prometheus_frontend_vip': monitoring_stack_vip | default()})
+                                     | combine({ 'alertmanager_frontend_vip': monitoring_stack_vip | default()}) }}"
       vars:
         dashboard_vip: |-
-         {% set dashboard_vip = control_virtual_ip %}
-         {% if frontend_vip.stdout != "nil" %}
-         {%   set dashboard_vip = frontend_vip.stdout %}
-         {% endif %}
-         {{ dashboard_vip }}
+          {% set dashboard_vip = control_virtual_ip %}
+          {% if 'StorageDashboard' in enabled_networks %}
+          {%     set dashboard_vip = net_vip_map.get('storage_dashboard') %}
+          {% endif %}
+          {{ dashboard_vip }}
+        monitoring_stack_vip: |-
+          {% set monitoring_vip = control_virtual_ip %}
+          {% if 'Storage' in enabled_networks %}
+          {%   set monitoring_vip = net_vip_map.get('storage') %}
+          {% endif %}
+          {{ monitoring_vip }}
   when:
     - tripleo_enabled_services | intersect(['ceph_grafana'])