diff --git a/fuel_health/muranomanager.py b/fuel_health/muranomanager.py
index 0b88ce08..63660895 100644
--- a/fuel_health/muranomanager.py
+++ b/fuel_health/muranomanager.py
@@ -57,11 +57,14 @@ class MuranoTest(fuel_health.nmanager.PlatformServicesBaseClass):
         self.murano_available = True
         self.endpoint = '{0}/v1/'.format(
             self.identity_client.service_catalog.url_for(
-                service_type='application_catalog',
+                service_type='application-catalog',
                 endpoint_type='publicURL'))
 
-        self.headers = {'X-Auth-Token': self.murano_client.auth_token,
-                        'content-type': 'application/json'}
+        self.headers = {
+            'X-Auth-Token': self.murano_client.http_client.auth_token,
+            'content-type': 'application/json'
+        }
+
         try:
             self.list_environments()
         except exceptions.CommunicationError:
diff --git a/fuel_health/nmanager.py b/fuel_health/nmanager.py
index 2f5ae452..1f314911 100644
--- a/fuel_health/nmanager.py
+++ b/fuel_health/nmanager.py
@@ -273,7 +273,7 @@ class OfficialClientManager(fuel_health.manager.Manager):
 
         try:
             endpoint = keystone.service_catalog.url_for(
-                service_type='application_catalog',
+                service_type='application-catalog',
                 endpoint_type='publicURL')
         except keystoneclient.exceptions.EndpointNotFound:
             LOG.warning('Endpoint for Murano service '