diff --git a/heat/engine/clients/os/ceilometer.py b/heat/engine/clients/os/ceilometer.py
index 8743dad284..53d948b09d 100644
--- a/heat/engine/clients/os/ceilometer.py
+++ b/heat/engine/clients/os/ceilometer.py
@@ -34,13 +34,14 @@ class CeilometerClientPlugin(client_plugin.ClientPlugin):
             'project_id': con.tenant,
             'token': lambda: self.auth_token,
             'endpoint_type': endpoint_type,
+            'os_endpoint': endpoint,
             'cacert': self._get_client_option('ceilometer', 'ca_file'),
             'cert_file': self._get_client_option('ceilometer', 'cert_file'),
             'key_file': self._get_client_option('ceilometer', 'key_file'),
             'insecure': self._get_client_option('ceilometer', 'insecure')
         }
 
-        return cc.Client('2', endpoint, **args)
+        return cc.get_client('2', **args)
 
     def is_not_found(self, ex):
         return isinstance(ex, (exc.HTTPNotFound, api_exc.NotFound))