diff --git a/.zuul.yaml b/.zuul.yaml
index b727fc147..57a831c9f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -26,7 +26,6 @@
       - openstack/mistral
       - openstack/python-vitrageclient
       - openstack/vitrage
-      - openstack/vitrage-dashboard
       - openstack/vitrage-tempest-plugin
     irrelevant-files:
       - ^.*\.rst$
@@ -45,7 +44,6 @@
       - openstack/mistral
       - openstack/python-vitrageclient
       - openstack/vitrage
-      - openstack/vitrage-dashboard
       - openstack/vitrage-tempest-plugin
     irrelevant-files:
       - ^.*\.rst$
@@ -64,7 +62,6 @@
       - openstack/mistral
       - openstack/python-vitrageclient
       - openstack/vitrage
-      - openstack/vitrage-dashboard
       - openstack/vitrage-tempest-plugin
     irrelevant-files:
       - ^.*\.rst$
@@ -83,7 +80,6 @@
       - openstack/mistral
       - openstack/python-vitrageclient
       - openstack/vitrage
-      - openstack/vitrage-dashboard
       - openstack/vitrage-tempest-plugin
     irrelevant-files:
       - ^.*\.rst$
diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh
index 95e9c7d6a..4d092641c 100644
--- a/devstack/post_test_hook.sh
+++ b/devstack/post_test_hook.sh
@@ -29,6 +29,13 @@ if [ "$DEVSTACK_GATE_USE_PYTHON3" == "True" ]; then
 fi
 
 sudo cp -rf $DEVSTACK_PATH/tempest/etc/logging.conf.sample $DEVSTACK_PATH/tempest/etc/logging.conf
+
+# restart due to configuration files changes
+sudo systemctl restart devstack@vitrage-graph.service
+
+# wait for 30 seconds
+sleep 30
+
 cd $DEVSTACK_PATH/tempest/
 sudo -E testr init
 
diff --git a/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
index c21e9dbdf..d5ccede0b 100644
--- a/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-api-py27/run.yaml
@@ -52,7 +52,6 @@
           export PROJECTS="openstack/aodh $PROJECTS"
           export PROJECTS="openstack/mistral $PROJECTS"
           export PROJECTS="openstack/vitrage $PROJECTS"
-          export PROJECTS="openstack/vitrage-dashboard $PROJECTS"
           export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS"
           export ENABLED_SERVICES=tempest
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
diff --git a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml
index ab91d4197..519025d71 100644
--- a/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-api-py35/run.yaml
@@ -52,7 +52,6 @@
           export PROJECTS="openstack/aodh $PROJECTS"
           export PROJECTS="openstack/mistral $PROJECTS"
           export PROJECTS="openstack/vitrage $PROJECTS"
-          export PROJECTS="openstack/vitrage-dashboard $PROJECTS"
           export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS"
           export ENABLED_SERVICES=tempest
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
index 23746271e..de6d910aa 100644
--- a/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-datasources-py27/run.yaml
@@ -52,7 +52,6 @@
           export PROJECTS="openstack/aodh $PROJECTS"
           export PROJECTS="openstack/mistral $PROJECTS"
           export PROJECTS="openstack/vitrage $PROJECTS"
-          export PROJECTS="openstack/vitrage-dashboard $PROJECTS"
           export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS"
           export ENABLED_SERVICES=tempest
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
diff --git a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml b/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml
index 629289a17..594d12741 100644
--- a/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml
+++ b/playbooks/legacy/vitrage-dsvm-datasources-py35/run.yaml
@@ -52,7 +52,6 @@
           export PROJECTS="openstack/aodh $PROJECTS"
           export PROJECTS="openstack/mistral $PROJECTS"
           export PROJECTS="openstack/vitrage $PROJECTS"
-          export PROJECTS="openstack/vitrage-dashboard $PROJECTS"
           export PROJECTS="openstack/vitrage-tempest-plugin $PROJECTS"
           export ENABLED_SERVICES=tempest
           export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
diff --git a/vitrage/os_clients.py b/vitrage/os_clients.py
index debefd54b..9a53942db 100644
--- a/vitrage/os_clients.py
+++ b/vitrage/os_clients.py
@@ -162,15 +162,13 @@ def heat_client(conf):
 
 def mistral_client(conf):
     """Get an instance of Mistral client"""
+    auth_config = conf.service_credentials
     try:
-        session = keystone_client.get_session(conf)
-        endpoint = session.get_endpoint(service_type='workflowv2',
-                                        endpoint_type='internalURL')
-        args = {
-            'mistral_url': endpoint,
-            'session': session
-        }
-        client = driver_module('mistral').Client(**args)
+        mi_client = driver_module('mistral')
+        client = mi_client.Client(
+            session=keystone_client.get_session(conf),
+            auth_url=auth_config.auth_url
+        )
         LOG.info('Mistral client created')
         return client
     except Exception as e: