diff --git a/tripleoclient/tests/v1/test_overcloud_export.py b/tripleoclient/tests/v1/test_overcloud_export.py
index 645b2022f..9c5e06535 100644
--- a/tripleoclient/tests/v1/test_overcloud_export.py
+++ b/tripleoclient/tests/v1/test_overcloud_export.py
@@ -52,6 +52,8 @@ class TestOvercloudExport(utils.TestCommand):
             self.app.client_manager.orchestration,
             'overcloud', True)
         path = os.path.join(os.environ.get('HOME'),
+                            'overcloud-deploy',
+                            'overcloud',
                             'config-download')
         mock_export_stack.assert_called_once_with(
             self.app.client_manager.orchestration,
@@ -82,6 +84,8 @@ class TestOvercloudExport(utils.TestCommand):
             self.app.client_manager.orchestration,
             'foo', True)
         path = os.path.join(os.environ.get('HOME'),
+                            'overcloud-deploy',
+                            'foo',
                             'config-download')
         mock_export_stack.assert_called_once_with(
             self.app.client_manager.orchestration,
diff --git a/tripleoclient/tests/v1/test_overcloud_export_ceph.py b/tripleoclient/tests/v1/test_overcloud_export_ceph.py
index c9cc501e7..f8e8f719e 100644
--- a/tripleoclient/tests/v1/test_overcloud_export_ceph.py
+++ b/tripleoclient/tests/v1/test_overcloud_export_ceph.py
@@ -61,6 +61,7 @@ class TestOvercloudExportCeph(utils.TestCommand):
 
         with mock.patch('six.moves.builtins.open', self.mock_open):
             self.cmd.take_action(parsed_args)
-        path = os.path.join(os.environ.get('HOME'), 'config-download')
+        path = os.path.join(os.environ.get('HOME'),
+                            'overcloud-deploy', 'dcn0', 'config-download')
         mock_export_ceph.assert_called_once_with('dcn0', 'openstack', path)
         self.assertEqual(data, mock_safe_dump.call_args[0][0])
diff --git a/tripleoclient/v1/overcloud_export.py b/tripleoclient/v1/overcloud_export.py
index d0b8173d1..e412b20e7 100644
--- a/tripleoclient/v1/overcloud_export.py
+++ b/tripleoclient/v1/overcloud_export.py
@@ -48,8 +48,8 @@ class ExportOvercloud(command.Command):
         parser.add_argument('--config-download-dir',
                             action='store',
                             help=_('Directory to search for config-download '
-                                   'export data. Defaults to '
-                                   '$HOME/config-download'))
+                                   'export data. Defaults to $HOME/'
+                                   'overcloud-deploy/<stack>/config-download'))
         parser.add_argument('--no-password-excludes',
                             action='store_true',
                             dest='no_password_excludes',
@@ -77,6 +77,8 @@ class ExportOvercloud(command.Command):
 
         if not parsed_args.config_download_dir:
             config_download_dir = os.path.join(os.environ.get('HOME'),
+                                               "overcloud-deploy",
+                                               parsed_args.stack,
                                                'config-download')
         else:
             config_download_dir = parsed_args.config_download_dir
diff --git a/tripleoclient/v1/overcloud_export_ceph.py b/tripleoclient/v1/overcloud_export_ceph.py
index f4f06916e..bad53a721 100644
--- a/tripleoclient/v1/overcloud_export_ceph.py
+++ b/tripleoclient/v1/overcloud_export_ceph.py
@@ -65,8 +65,8 @@ class ExportOvercloudCeph(command.Command):
         parser.add_argument('--config-download-dir',
                             action='store',
                             help=_('Directory to search for config-download '
-                                   'export data. Defaults to '
-                                   '$HOME/config-download'))
+                                   'export data. Defaults to $HOME/'
+                                   'overcloud-deploy/<stack>/config-download'))
 
         return parser
 
@@ -92,6 +92,8 @@ class ExportOvercloudCeph(command.Command):
 
         if not parsed_args.config_download_dir:
             config_download_dir = os.path.join(os.environ.get('HOME'),
+                                               "overcloud-deploy",
+                                               parsed_args.stack,
                                                'config-download')
         else:
             config_download_dir = parsed_args.config_download_dir