diff --git a/userguide/platform/includes/killbill-configuration-properties-table.adoc b/userguide/platform/includes/killbill-configuration-properties-table.adoc
index 7c464d153..eff89ef49 100644
--- a/userguide/platform/includes/killbill-configuration-properties-table.adoc
+++ b/userguide/platform/includes/killbill-configuration-properties-table.adoc
@@ -1081,7 +1081,12 @@ KB_org_killbill_template_invoiceFormatterFactoryPluginName   |Invoice formatter
 |===
 |Property Name/Environment Variable Name   |Description   |Default Value | Configuration Method
 //-------------------------------------------------
-|org.killbill.queue.creator.name   |Allow to override the default naming based on Hostname  |-  |System Property
-|org.killbill.queue.creator.autoGeneratedName   |If set to true and `org.killbill.queue.creator.name` is not set, generate a UUID instead of using default hostname   |-   |System Property
+|org.killbill.queue.creator.name
+/KILLBILL_QUEUE_CREATOR_NAME   |Allow to override the default naming based on Hostname  |-  |System Property/Environment Variable
+|org.killbill.queue.creator.autoGeneratedName
+/KILLBILL_QUEUE_CREATOR_AUTOGENERATE_NAME   |If set to true and `org.killbill.queue.creator.name` is not set, generate a UUID instead of using default hostname   |true   |System Property/Environment Variable
 
-|===
\ No newline at end of file
+|===
+
+[NOTE]
+In case of a Tomcat-based environment, the above properties can be configured as system properties. In case of Docker systems, they can be set via the environment variables mentioned above.
\ No newline at end of file