diff --git a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
index f756c4864..057e045d5 100644
--- a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
+++ b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
@@ -88,13 +88,14 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare):
         # Check config_download arg is set to False
         self.assertEqual(args[0].stack_only, True)
         mock_enable_ssh_admin.assert_called_once_with(
-            mock_stack,
+            parsed_args.stack,
             parsed_args.overcloud_ssh_network,
             parsed_args.overcloud_ssh_user,
             mock.ANY,
             parsed_args.overcloud_ssh_port_timeout,
             self.cmd.working_dir,
-            mock.ANY
+            mock.ANY,
+            'pod'
         )
 
     @mock.patch('tripleoclient.utils.ensure_run_as_normal_user')
diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py
index aedc087a9..bc160df37 100644
--- a/tripleoclient/v1/overcloud_upgrade.py
+++ b/tripleoclient/v1/overcloud_upgrade.py
@@ -73,8 +73,6 @@ class UpgradePrepare(DeployOvercloud):
             oooutils.check_deprecated_service_is_enabled(
                 parsed_args.environment_files)
 
-        clients = self.app.client_manager
-
         # In case of update and upgrade we need to force the
         # stack_only to true. The heat stack update will be performed
         # by DeployOvercloud class but skipping the config download part.
@@ -92,23 +90,19 @@ class UpgradePrepare(DeployOvercloud):
                                           self.forbidden_params)
         super(UpgradePrepare, self).take_action(parsed_args)
 
-        stack = oooutils.get_stack(clients.orchestration,
-                                   parsed_args.stack)
-        stack_name = stack.stack_name
-        # enable ssh admin for Ansible-via-Mistral as that's done only
-        # when config_download is true
         deployment.get_hosts_and_enable_ssh_admin(
-            stack,
+            parsed_args.stack,
             parsed_args.overcloud_ssh_network,
             parsed_args.overcloud_ssh_user,
             self.get_key_pair(parsed_args),
             parsed_args.overcloud_ssh_port_timeout,
             working_dir=self.working_dir,
-            verbosity=oooutils.playbook_verbosity(self=self)
+            verbosity=oooutils.playbook_verbosity(self=self),
+            heat_type=parsed_args.heat_type
         )
 
         self.log.info("Completed Overcloud Upgrade {} for stack "
-                      "{}".format(self.operation, stack_name))
+                      "{}".format(self.operation, parsed_args.stack))
 
 
 class UpgradeRun(command.Command):