diff --git a/tripleoclient/plugin.py b/tripleoclient/plugin.py
index 2e304db06..d000352d9 100644
--- a/tripleoclient/plugin.py
+++ b/tripleoclient/plugin.py
@@ -90,6 +90,7 @@ class ClientWrapper(object):
 
         return self._baremetal
 
+    @property
     def orchestration(self):
         """Returns an orchestration service client"""
 
diff --git a/tripleoclient/tests/v1/overcloud_deploy/fakes.py b/tripleoclient/tests/v1/overcloud_deploy/fakes.py
index 407774072..5efda9d48 100644
--- a/tripleoclient/tests/v1/overcloud_deploy/fakes.py
+++ b/tripleoclient/tests/v1/overcloud_deploy/fakes.py
@@ -50,6 +50,7 @@ class FakeClientWrapper(object):
         self._orchestration = mock.Mock()
         self._baremetal = mock.Mock()
 
+    @property
     def orchestration(self):
         return self._orchestration
 
diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
index b35ebd52c..4f0f101f4 100644
--- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
+++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
@@ -105,7 +105,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         mock_generate_overcloud_passwords.return_value = self._get_passwords()
 
         clients = self.app.client_manager
-        orchestration_client = clients.tripleoclient.orchestration()
+        orchestration_client = clients.tripleoclient.orchestration
         orchestration_client.stacks.get.return_value = fakes.create_tht_stack()
 
         mock_check_hypervisor_stats.return_value = {
@@ -255,7 +255,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         mock_generate_overcloud_passwords.return_value = self._get_passwords()
 
         clients = self.app.client_manager
-        orchestration_client = clients.tripleoclient.orchestration()
+        orchestration_client = clients.tripleoclient.orchestration
         mock_stack = fakes.create_tht_stack()
         orchestration_client.stacks.get.return_value = None
 
@@ -413,7 +413,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         mock_generate_overcloud_passwords.return_value = self._get_passwords()
 
         clients = self.app.client_manager
-        orchestration_client = clients.tripleoclient.orchestration()
+        orchestration_client = clients.tripleoclient.orchestration
         orchestration_client.stacks.get.return_value = fakes.create_tht_stack()
 
         mock_check_hypervisor_stats.return_value = {
@@ -577,7 +577,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
                 autospec=True)
     def test_pre_heat_deploy_failed(self, mock_check_hypervisor_stats):
         clients = self.app.client_manager
-        orchestration_client = clients.tripleoclient.orchestration()
+        orchestration_client = clients.tripleoclient.orchestration
         orchestration_client.stacks.get.return_value = None
         mock_check_hypervisor_stats.return_value = None
         arglist = ['--templates']
diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index 6228764d1..b5d7d3795 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -229,7 +229,7 @@ class DeployOvercloud(command.Command):
         files = dict(list(template_files.items()) + list(env_files.items()))
 
         clients = self.app.client_manager
-        orchestration_client = clients.tripleoclient.orchestration()
+        orchestration_client = clients.tripleoclient.orchestration
 
         self.log.debug("Deploying stack: %s", stack_name)
         self.log.debug("Deploying template: %s", template)
@@ -859,7 +859,7 @@ class DeployOvercloud(command.Command):
                           "configuration, proceeding.")
 
         clients = self.app.client_manager
-        orchestration_client = clients.tripleoclient.orchestration()
+        orchestration_client = clients.tripleoclient.orchestration
 
         stack = utils.get_stack(orchestration_client, parsed_args.stack)
         stack_create = stack is None
diff --git a/tripleoclient/v1/overcloud_node.py b/tripleoclient/v1/overcloud_node.py
index b3b21ac39..94f2ddf98 100644
--- a/tripleoclient/v1/overcloud_node.py
+++ b/tripleoclient/v1/overcloud_node.py
@@ -53,7 +53,7 @@ class DeleteNode(command.Command):
         self.log.debug("take_action(%s)" % parsed_args)
         osc_plugin = self.app.client_manager.tripleoclient
 
-        orchestration = osc_plugin.orchestration()
+        orchestration = osc_plugin.orchestration
         scale_manager = scale.ScaleManager(
             heatclient=orchestration,
             stack_id=parsed_args.stack,
diff --git a/tripleoclient/v1/overcloud_update.py b/tripleoclient/v1/overcloud_update.py
index 861a97a66..a388b6a51 100644
--- a/tripleoclient/v1/overcloud_update.py
+++ b/tripleoclient/v1/overcloud_update.py
@@ -57,7 +57,7 @@ class UpdateOvercloud(command.Command):
         self.log.debug("take_action(%s)" % parsed_args)
         osc_plugin = self.app.client_manager.tripleoclient
 
-        orchestration = osc_plugin.orchestration()
+        orchestration = osc_plugin.orchestration
         update_manager = update.PackageUpdateManager(
             heatclient=orchestration,
             novaclient=self.app.client_manager.compute,