diff --git a/openappstack/__main__.py b/openappstack/__main__.py
index d267ed6aa721c13565eba47a7ab0ad3a4cf5bd3e..81dda75f4fcc5fbc26c5817397933fb456c248ff 100755
--- a/openappstack/__main__.py
+++ b/openappstack/__main__.py
@@ -68,8 +68,8 @@ def main():  # pylint: disable=too-many-statements,too-many-branches,too-many-lo
     create_parser.add_argument(
         '--create-hostname',
         type=str,
-        help='hostname of the machine. If not provided for a new machine, a '
-             'hostname is generated.')
+        help='hostname of the machine. If not provided for a new machine, the '
+             'cluster name is used.')
 
     group = create_parser.add_mutually_exclusive_group(required=True)
 
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index 340144270e1beb030c4c6afa79ca65d6f5c7827c..0d6f74baab46e6949cae6f4c7f081a4f4be06758 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -90,8 +90,7 @@ class Cluster:
             the cluster name
         """
         if hostname is None:
-            # Use random generated ID in case we're not running in
-            # gitlab CI and there's no CI_PIPELINE_ID env var
+            # If hostname is not set use cluster name for it.
             hostname = self.name
         droplet = greenhost_cloud.create_droplet(
             name=hostname,