diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index 7245f6bea..7acc5b020 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -486,7 +486,7 @@ class DeployOvercloud(command.Command):
             'admin@example.com',
             passwords['OVERCLOUD_ADMIN_PASSWORD'],
             public=overcloud_ip,
-            user='heat-admin')
+            user=parsed_args.overcloud_ssh_user)
 
         # NOTE(bcrochet): Bad hack. Remove the ssl_port info from the
         # os_cloud_config.SERVICES dictionary
@@ -879,6 +879,11 @@ class DeployOvercloud(command.Command):
             help=_('A comma separated list of hosts that should not be '
                    'proxied.')
         )
+        parser.add_argument(
+            '--overcloud-ssh-user',
+            default='heat-admin',
+            help=_('User for ssh access to overcloud nodes')
+        )
         parser.add_argument(
             '-e', '--environment-file', metavar='<HEAT ENVIRONMENT FILE>',
             action='append', dest='environment_files',