diff --git a/cws-installer/src/main/resources/log4j2.properties b/cws-installer/src/main/resources/log4j2.properties
index d4d1a5c6..92bfc54c 100644
--- a/cws-installer/src/main/resources/log4j2.properties
+++ b/cws-installer/src/main/resources/log4j2.properties
@@ -19,7 +19,7 @@ status = warn
 appender.console.type = Console
 appender.console.name = STDOUT
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = INSTALLER: %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %m%n
+appender.console.layout.pattern = INSTALLER: %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %encode{%m}{CRLF}%n
 
 # configure loggers
 # Spring Framework
diff --git a/install/tomcat_lib/log4j2-tomcat.properties b/install/tomcat_lib/log4j2-tomcat.properties
index 352a2c08..7073ebaa 100644
--- a/install/tomcat_lib/log4j2-tomcat.properties
+++ b/install/tomcat_lib/log4j2-tomcat.properties
@@ -16,7 +16,7 @@ appender.rolling.name = RollingFile
 appender.rolling.fileName = ${sys:catalina.base}/logs/cws.log
 appender.rolling.filePattern = ${sys:catalina.base}/logs/cws.%d{yyyy-MM-dd}.log
 appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %m%n
+appender.rolling.layout.pattern = %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %encode{%m}{CRLF}%n
 appender.rolling.policies.type = Policies
 appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
 appender.rolling.policies.time.interval = 1
@@ -30,7 +30,7 @@ appender.artemis.name = ArtemisFile
 appender.artemis.fileName = ${sys:catalina.base}/logs/artemis.log
 appender.artemis.filePattern = ${sys:catalina.base}/logs/artemis.%d{yyyy-MM-dd}.log
 appender.artemis.layout.type = PatternLayout
-appender.artemis.layout.pattern = %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %m%n
+appender.artemis.layout.pattern = %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %encode{%m}{CRLF}%n
 appender.artemis.policies.type = Policies
 appender.artemis.policies.time.type = TimeBasedTriggeringPolicy
 appender.artemis.policies.time.interval = 1
@@ -49,7 +49,7 @@ appender.rolling.strategy.fileIndex = nomax
 appender.CONSOLE.type = Console
 appender.CONSOLE.name = STDOUT
 appender.CONSOLE.layout.type = PatternLayout
-appender.CONSOLE.layout.pattern = %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %m%n
+appender.CONSOLE.layout.pattern = %d{ISO8601}{UTC} %-5p [%20.20t] %30.30c(%4.4L) - %encode{%m}{CRLF}%n
 
 ## Configure which loggers log to which appenders