diff --git a/core/Dockerfile b/core/Dockerfile
index 71efb0e5ba..e9f5257ae7 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -44,7 +44,9 @@ ENV LOG_LEVEL=INFO \
   EXTRA_JARS= \
   PRINT_YAML_MAX_ALIASES=50 \
   JAVA_OPTS=-Dsun.net.inetaddr.ttl=30 \
-  SENTRY_DSN=
+  SENTRY_DSN= \
+  UMASK=0022 \
+  CATALINA_OPTS=${CATALINA_OPTS} -Dlogback.configurationFile=${CATALINA_HOME}/conf/logback.xml
 
 CMD ["/usr/local/tomcat/bin/docker-start-print"]
 
diff --git a/core/docker/usr/local/tomcat/bin/setenv.sh b/core/docker/usr/local/tomcat/bin/setenv.sh
index 9911b06111..a63af00b66 100755
--- a/core/docker/usr/local/tomcat/bin/setenv.sh
+++ b/core/docker/usr/local/tomcat/bin/setenv.sh
@@ -3,7 +3,3 @@ CLASSPATH=${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.ja
 for jar in ${CATALINA_HOME}/lib/*; do
     CLASSPATH=${CLASSPATH}:$jar
 done
-
-UMASK="0022"
-
-CATALINA_OPTS="${CATALINA_OPTS} -Dlogback.configurationFile=${CATALINA_HOME}/conf/logback.xml"
diff --git a/core/docker/usr/local/tomcat/conf/logback-access.xml b/core/docker/usr/local/tomcat/conf/logback-access.xml
index 535ca73b47..6fef45513b 100644
--- a/core/docker/usr/local/tomcat/conf/logback-access.xml
+++ b/core/docker/usr/local/tomcat/conf/logback-access.xml
@@ -1,4 +1,5 @@
-<configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
     <appender name="classic" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%h %l %u %user %date "%r" %s %b</pattern>
@@ -77,4 +78,4 @@
 
 
     <appender-ref ref="${TOMCAT_LOG_TYPE}" />
-</configuration>
+</included>
diff --git a/core/docker/usr/local/tomcat/conf/logback.xml b/core/docker/usr/local/tomcat/conf/logback.xml
index 037f8d760b..186e621818 100644
--- a/core/docker/usr/local/tomcat/conf/logback.xml
+++ b/core/docker/usr/local/tomcat/conf/logback.xml
@@ -1,34 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <appender name="classic" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-        <target>System.err</target>
-    </appender>
-
-    <appender name="json" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
-            <fieldNames>
-                <timestamp>timegenerated</timestamp>
-                <level>level_name</level>
-                <message>msg</message>
-            </fieldNames>
-        </encoder>
-        <target>System.err</target>
-    </appender>
-
-    <appender name="Sentry" class="io.sentry.logback.SentryAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>${SENTRY_REPORTING_LOG_LEVEL}</level>
-        </filter>
-    </appender>
-
-    <logger name="org.apache.catalina" level="${TOMCAT_LOG_LEVEL}"/>
-    <logger name="org.apache.coyote" level="${TOMCAT_LOG_LEVEL}"/>
-    <logger name="io.sentry" level="${SENTRY_LOG_LEVEL}"/>
-
+    <include file="${CATALINA_HOME}/conf/logback-base.xml"/>
     <include file="${CATALINA_HOME}/conf/logback-custom.xml"/>
+    <include file="${CATALINA_HOME}/conf/logback-access.xml"/>
 
     <root level="${DEFAULT_LOG_LEVEL}">
         <appender-ref ref="${TOMCAT_LOG_TYPE}" />