diff --git a/kollacli/api/deploy.py b/kollacli/api/deploy.py
index 2a8ca2d..24f9b0d 100644
--- a/kollacli/api/deploy.py
+++ b/kollacli/api/deploy.py
@@ -30,6 +30,9 @@ class DeployApi(object):
         that the openstack deployment will be to the local host.
         Remote means that the deployment is executed via ssh.
 
+        NOTE: local mode is not supported and should never be used
+        in production environments.
+
         :param remote_mode: if remote mode is True deployment is done via ssh
         :type remote_mode: bool
         """
diff --git a/kollacli/api/host.py b/kollacli/api/host.py
index 5686f29..34107c2 100644
--- a/kollacli/api/host.py
+++ b/kollacli/api/host.py
@@ -112,11 +112,11 @@ class HostApi(object):
         """Check hosts for ssh connectivity
 
         Check status is a dictionary of form:
-        - {hostname: {
+            - {hostname: {
               'success':<True|False>,
               'msg':message_string},
-           ...
-          }
+              ...
+              }
 
         :param hostnames: list of strings
         :return: check status
@@ -133,11 +133,12 @@ class HostApi(object):
         """Setup multiple hosts for ssh access
 
         hosts_info is a dictionary of form:
-        {hostname': {
-            'password': password
-            'uname': user_name},
-         ...
-        }
+            - {hostname': {
+              'password': password
+              'uname': user_name},
+              ...
+              }
+
         The uname entry is optional.
 
         :param hosts_info: dictionary
diff --git a/kollacli/commands/deploy.py b/kollacli/commands/deploy.py
index 5488a8c..dcd102a 100644
--- a/kollacli/commands/deploy.py
+++ b/kollacli/commands/deploy.py
@@ -85,10 +85,13 @@ class Setdeploy(Command):
     def take_action(self, parsed_args):
         try:
             mode = parsed_args.mode.strip()
-            remote_flag = False
-            if mode == 'remote':
-                remote_flag = True
-            elif mode != 'local':
+            remote_flag = True
+            if mode == 'local':
+                remote_flag = False
+                LOG.info(u._('Please note that local mode is not supported '
+                             'and should never be used in production '
+                             'environments.'))
+            elif mode != 'remote':
                 raise CommandError(
                     u._('Invalid deploy mode. Mode must be '
                         'either "local" or "remote".'))