diff --git a/userguide/platform/includes/killbill-configuration-properties-table.adoc b/userguide/platform/includes/killbill-configuration-properties-table.adoc
index 0cd70b065..eff89ef49 100644
--- a/userguide/platform/includes/killbill-configuration-properties-table.adoc
+++ b/userguide/platform/includes/killbill-configuration-properties-table.adoc
@@ -1075,3 +1075,18 @@ KB_org_killbill_manualPayTemplate_name   |Path to the invoice template for accou
 KB_org_killbill_template_invoiceFormatterFactoryPluginName   |Invoice formatter factory plugin name   |null   |Config File/Environment Variable
 |===
 
+=== Queue Properties
+
+[options="header",cols="1,1,1,1"]
+|===
+|Property Name/Environment Variable Name   |Description   |Default Value | Configuration Method
+//-------------------------------------------------
+|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
+
+|===
+
+[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