diff --git a/elasticsearch/config/x-pack/log4j2.properties b/elasticsearch/config/x-pack/log4j2.properties
index d44184be7c1..8968bd51d1b 100644
--- a/elasticsearch/config/x-pack/log4j2.properties
+++ b/elasticsearch/config/x-pack/log4j2.properties
@@ -1,9 +1,9 @@
 appender.audit_rolling.type = RollingFile
 appender.audit_rolling.name = audit_rolling
-appender.audit_rolling.fileName = ${sys:es.logs}_access.log
+appender.audit_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_access.log
 appender.audit_rolling.layout.type = PatternLayout
 appender.audit_rolling.layout.pattern = [%d{ISO8601}] %m%n
-appender.audit_rolling.filePattern = ${sys:es.logs}_access-%d{yyyy-MM-dd}.log
+appender.audit_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_access-%d{yyyy-MM-dd}.log
 appender.audit_rolling.policies.type = Policies
 appender.audit_rolling.policies.time.type = TimeBasedTriggeringPolicy
 appender.audit_rolling.policies.time.interval = 1