diff --git a/docker/templates/killbill/latest/kpm.yml.erb b/docker/templates/killbill/latest/kpm.yml.erb
index f3871b83..150cd59f 100644
--- a/docker/templates/killbill/latest/kpm.yml.erb
+++ b/docker/templates/killbill/latest/kpm.yml.erb
@@ -3,7 +3,7 @@ killbill:
   artifact_id: <%= ENV['KILLBILL_ARTIFACT_ID'] %>
   version: <%= ENV['KILLBILL_VERSION'] %>
   default_bundles_version: <%= ENV['KILLBILL_DEFAULT_BUNDLES_VERSION'] %>
-  jvm: "-server -Djava.security.egd=file:/dev/./urandom -XX:PermSize=<%= ENV['KILLBILL_JVM_PERM_SIZE'] %> -XX:MaxPermSize=<%= ENV['KILLBILL_JVM_MAX_PERM_SIZE'] %> -Xms<%= ENV['KILLBILL_JVM_XMS'] %> -Xmx<%= ENV['KILLBILL_JVM_XMX'] %> -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=12345 -XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow -XX:+UseConcMarkSweepGC -Xloggc:/var/log/tomcat7/gc.log -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dorg.killbill.server.properties=file://<%= ENV['KILLBILL_CONFIG'] %>/killbill.properties -Dlogback.configurationFile=<%= ENV['KILLBILL_CONFIG'] %>/logback.xml"
+  jvm: "-server -Djava.security.egd=file:/dev/./urandom -XX:PermSize=<%= ENV['KILLBILL_JVM_PERM_SIZE'] %> -XX:MaxPermSize=<%= ENV['KILLBILL_JVM_MAX_PERM_SIZE'] %> -Xms<%= ENV['KILLBILL_JVM_XMS'] %> -Xmx<%= ENV['KILLBILL_JVM_XMX'] %> -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=12345 -XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow -XX:+UseConcMarkSweepGC -Xloggc:/var/log/tomcat7/gc.log -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintTenuringDistribution -Dorg.killbill.server.properties=file://<%= ENV['KILLBILL_CONFIG'] %>/killbill.properties -Dlogback.configurationFile=<%= ENV['KILLBILL_CONFIG'] %>/logback.xml -Dorg.killbill.queue.creator.name=<%= ENV['KILLBILL_QUEUE_CREATOR_NAME'] %>"
   nexus:
     ssl_verify: false
     url: <%= ENV['NEXUS_URL'] %>
@@ -35,7 +35,6 @@ killbill:
     org.killbill.notificationq.analytics.tableName: analytics_notifications
     org.killbill.osgi.bundle.install.dir: <%= ENV['KILLBILL_HOME'] %>/bundles
     org.killbill.osgi.root.dir: <%= ENV['KILLBILL_HOME'] %>/felix-cache
-    org.killbill.queue.creator.name: <%= ENV['KILLBILL_QUEUE_CREATOR_NAME'] %>
     org.killbill.server.baseUrl: http://localhost:8080
     org.killbill.server.properties: file://<%= ENV['KILLBILL_CONFIG'] %>/killbill.properties
     org.killbill.server.http.gzip: true