diff --git a/manifests/broker/config.pp b/manifests/broker/config.pp
index 76a10453..6c87822e 100644
--- a/manifests/broker/config.pp
+++ b/manifests/broker/config.pp
@@ -16,6 +16,7 @@
   Optional[String[1]] $log4j_content            = $kafka::broker::log4j_content,
   Pattern[/[1-9][0-9]*[KMG]B/] $log_file_size   = $kafka::broker::log_file_size,
   Integer[1, 50] $log_file_count                = $kafka::broker::log_file_count,
+  Stdlib::Absolutepath $log_dir                 = $kafka::broker::log_dir,
 ) {
   assert_private()
 
@@ -46,7 +47,7 @@
       owner   => $user_name,
       group   => $group_name,
       mode    => $config_mode,
-      content => $_log4j_content,
+      content => epp('kafka/log4j.properties.epp', { 'log_file_size' => $log_file_size, 'log_file_count' => $log_file_count, 'log_dir' => $log_dir }),
       notify  => $config_notify,
       require => File[$config_dir],
     }
diff --git a/templates/log4j.properties.epp b/templates/log4j.properties.epp
index 9e0bc2f2..ca6eef15 100644
--- a/templates/log4j.properties.epp
+++ b/templates/log4j.properties.epp
@@ -27,42 +27,42 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%d] %p %m (%c)%n
 
 log4j.appender.kafkaAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.kafkaAppender.File=${kafka.logs.dir}/server.log
+log4j.appender.kafkaAppender.File=<%= $log_dir %>/server.log
 log4j.appender.kafkaAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.kafkaAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
 log4j.appender.kafkaAppender.MaxFileSize=<%= $log_file_size %>
 log4j.appender.kafkaAppender.MaxBackupIndex=<%= $log_file_count %>
 
 log4j.appender.stateChangeAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.stateChangeAppender.File=${kafka.logs.dir}/state-change.log
+log4j.appender.stateChangeAppender.File=<%= $log_dir %>/state-change.log
 log4j.appender.stateChangeAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.stateChangeAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
 log4j.appender.stateChangeAppender.MaxFileSize=<%= $log_file_size %>
 log4j.appender.stateChangeAppender.MaxBackupIndex=<%= $log_file_count %>
 
 log4j.appender.requestAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.requestAppender.File=${kafka.logs.dir}/kafka-request.log
+log4j.appender.requestAppender.File=<%= $log_dir %>/kafka-request.log
 log4j.appender.requestAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.requestAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
 log4j.appender.requestAppender.MaxFileSize=<%= $log_file_size %>
 log4j.appender.requestAppender.MaxBackupIndex=<%= $log_file_count %>
 
 log4j.appender.cleanerAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.cleanerAppender.File=${kafka.logs.dir}/log-cleaner.log
+log4j.appender.cleanerAppender.File=<%= $log_dir %>/log-cleaner.log
 log4j.appender.cleanerAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.cleanerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
 log4j.appender.cleanerAppender.MaxFileSize=<%= $log_file_size %>
 log4j.appender.cleanerAppender.MaxBackupIndex=<%= $log_file_count %>
 
 log4j.appender.controllerAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.controllerAppender.File=${kafka.logs.dir}/controller.log
+log4j.appender.controllerAppender.File=<%= $log_dir %>/controller.log
 log4j.appender.controllerAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.controllerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
 log4j.appender.controllerAppender.MaxFileSize=<%= $log_file_size %>
 log4j.appender.controllerAppender.MaxBackupIndex=<%= $log_file_count %>
 
 log4j.appender.authorizerAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.authorizerAppender.File=${kafka.logs.dir}/kafka-authorizer.log
+log4j.appender.authorizerAppender.File=<%= $log_dir %>/kafka-authorizer.log
 log4j.appender.authorizerAppender.layout=org.apache.log4j.PatternLayout
 log4j.appender.authorizerAppender.layout.ConversionPattern=[%d] %p %m (%c)%n
 log4j.appender.authorizerAppender.MaxFileSize=<%= $log_file_size %>