diff --git a/etc/solum/solum.conf.sample b/etc/solum/solum.conf.sample
index b3a041c16..dd612c793 100644
--- a/etc/solum/solum.conf.sample
+++ b/etc/solum/solum.conf.sample
@@ -729,20 +729,12 @@
 # communication with the mistral service. (string value)
 #endpoint_type=publicURL
 
-# Optional CA cert file to use in SSL connections. (string
-# value)
+# Optional CA cert file to use in SSL connections with
+# Mistral. (string value)
 #cacert=<None>
 
-# If set the server certificate will not be verified. (boolean
-# value)
-#insecure=false
-
-# Optional CA cert file to use in SSL connections. (string
-# value)
-#cacert=<None>
-
-# If set the server certificate will not be verified. (boolean
-# value)
+# If set the server certificate will not be verified while
+# using Mistral. (boolean value)
 #insecure=false
 
 
@@ -775,6 +767,14 @@
 # communication with the Swift service. (string value)
 #endpoint_type=publicURL
 
+# Optional CA cert file to use in SSL connections. (string
+# value)
+#cacert=<None>
+
+# If set the server certificate will not be verified. (boolean
+# value)
+#insecure=false
+
 
 [worker]
 
diff --git a/solum/common/clients.py b/solum/common/clients.py
index 2e7aa46a1..84ab2a095 100644
--- a/solum/common/clients.py
+++ b/solum/common/clients.py
@@ -90,10 +90,12 @@ mistral_client_opts = [
                    'Type of endpoint in Identity service catalog to use '
                    'for communication with the mistral service.')),
     cfg.StrOpt('cacert',
-               help=_('Optional CA cert file to use in SSL connections.')),
+               help=_('Optional CA cert file to use in SSL connections '
+                      'with Mistral.')),
     cfg.BoolOpt('insecure',
                 default=False,
-                help=_("If set the server certificate will not be verified."))]
+                help=_("If set the server certificate will not be verified "
+                       "while using Mistral."))]
 
 cfg.CONF.register_opts(glance_client_opts, group='glance_client')
 cfg.CONF.register_opts(heat_client_opts, group='heat_client')