diff --git a/.gitignore b/.gitignore
index 0f3836ed6..1b40c8dc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ __pycache__/
 .mcp/
 tests/*_results/
 tests/*.log
-tests/compliance_test.env
\ No newline at end of file
+tests/compliance_test.env
+docker-compose.yml
diff --git a/keepercommander/__main__.py b/keepercommander/__main__.py
index eaf7cba03..f2cfa59aa 100644
--- a/keepercommander/__main__.py
+++ b/keepercommander/__main__.py
@@ -119,6 +119,7 @@ def show_brief_help():
     print('  --password, -kp PASSWORD Master password for the account')
     print('  --config CONFIG          Config file to use')
     print('  --debug                  Turn on debug mode')
+    print('  --silent                 Turn off all logging statements')    
     print('  --batch-mode             Run in batch/non-interactive mode')
     print('  --proxy PROXY            Proxy server')
     print('  --new-login              Force full login (bypass persistent login)')
@@ -152,6 +153,7 @@ def show_brief_help():
 parser.add_argument('--version', dest='version', action='store_true', help='Display version')
 parser.add_argument('--config', dest='config', action='store', help='Config file to use')
 parser.add_argument('--debug', dest='debug', action='store_true', help='Turn on debug mode')
+parser.add_argument('--silent', dest='silent', action='store_true', help='Turn off all logging statements')
 parser.add_argument('--batch-mode', dest='batch_mode', action='store_true', help='Run commander in batch or basic UI mode.')
 parser.add_argument('--launched-with-shortcut', '-lwsc', dest='launched_with_shortcut', action='store',
                     help='Indicates that the app was launched using a shortcut, for example using Mac App or from '
@@ -292,7 +294,7 @@ def main(from_package=False):
                 value_main_parser_args = ['--config', '--server', '--user', '--password',
                                           '--launched-with-shortcut', '--proxy',
                                           '--data-dir', '-ks', '-ku', '-kp', '-lwsc']
-                bool_main_parser_args = ['--version', '--debug', '--batch-mode',
+                bool_main_parser_args = ['--version', '--debug', '--silent', '--batch-mode',
                                          '--unmask-all', '--fail-on-throttle',
                                          '--new-login', '--config-file']
                 main_parser_args = value_main_parser_args + bool_main_parser_args
@@ -319,6 +321,9 @@ def main(from_package=False):
     if opts.launched_with_shortcut:
         os.chdir(Path.home())
 
+    if opts.silent:
+        logging.disable(logging.CRITICAL)
+
     params = get_params_from_config(opts.config, opts.launched_with_shortcut, opts.data_dir)
 
     if opts.batch_mode:
diff --git a/keepercommander/service/commands/service_docker_setup.py b/keepercommander/service/commands/service_docker_setup.py
index 2228d1d1a..af74f3480 100644
--- a/keepercommander/service/commands/service_docker_setup.py
+++ b/keepercommander/service/commands/service_docker_setup.py
@@ -72,7 +72,7 @@ def execute(self, params, **kwargs):
         self._require_file_based_config(params, 'service-docker-setup')
 
         # Parse arguments
-        config_path = self._get_config_path(kwargs.get('config_path'))
+        config_path = self._get_config_path(kwargs.get('config_path') or params.config_filename)
         
         # Print header
         DockerSetupPrinter.print_header("Docker Setup")