diff --git a/images/dotcms/Dockerfile b/images/dotcms/Dockerfile
index 6253092..ec5e2d3 100644
--- a/images/dotcms/Dockerfile
+++ b/images/dotcms/Dockerfile
@@ -15,7 +15,7 @@ ARG BUILD_ID
 WORKDIR /srv
 
 # Build env dependencies
-RUN apk update && apk --no-cache add bash grep openssl git nodejs-current nodejs-current-dev sed
+RUN apk update && apk --no-cache add bash grep openssl git nodejs=10.14.2-r0 npm=10.14.2-r0  sed
 
 # dotCMS core distributed under GPLv3 license (https://github.com/dotCMS/core/blob/master/license.txt)
 COPY build-src/ /build/
@@ -63,7 +63,13 @@ RUN wget --quiet https://github.com/jwilder/dockerize/releases/download/$DOCKERI
 
 COPY --from=build-cms /srv/ /srv/
 COPY ROOT/ /
+
 RUN find /srv/ -type f -name "*.sh" -exec chmod 551 {} \;
+RUN mkdir -p /srv/home
+
+RUN chmod 777 /srv/home
+RUN chmod a+wr /srv/templates/dotcms/CONF
+
 RUN mkdir -p /data/shared/assets && mkdir -p /data/local/dotsecure/license
 RUN chmod -R 660 /data && find /data/ -type d -exec chmod 770 {} \;
 
diff --git a/images/dotcms/ROOT/srv/50-database-config.sh b/images/dotcms/ROOT/srv/50-database-config.sh
index 71cb10b..99d5c67 100644
--- a/images/dotcms/ROOT/srv/50-database-config.sh
+++ b/images/dotcms/ROOT/srv/50-database-config.sh
@@ -41,9 +41,9 @@ case "$PROVIDER_DB_DRIVER" in
 esac
 
 
-touch /srv/DB_CONNECT_TEST
-[[ "$PROVIDER_DB_DRIVER" != "H2" ]] && echo "${PROVIDER_DB_DNSNAME}:${PROVIDER_DB_PORT}" >/srv/DB_CONNECT_TEST
-chmod 400 /srv/DB_CONNECT_TEST
+touch /tmp/DB_CONNECT_TEST
+[[ "$PROVIDER_DB_DRIVER" != "H2" ]] && echo "${PROVIDER_DB_DNSNAME}:${PROVIDER_DB_PORT}" >/tmp/DB_CONNECT_TEST
+
 
 echo "PROVIDER_DB_DRIVER=${PROVIDER_DB_DRIVER}" >>/srv/config/settings.ini
 [[ -n "$PROVIDER_DB_URL" ]] && echo "PROVIDER_DB_URL=${PROVIDER_DB_URL}" >>/srv/config/settings.ini
diff --git a/images/dotcms/ROOT/srv/entrypoint.sh b/images/dotcms/ROOT/srv/entrypoint.sh
index 7f7caad..3cf3fd6 100644
--- a/images/dotcms/ROOT/srv/entrypoint.sh
+++ b/images/dotcms/ROOT/srv/entrypoint.sh
@@ -30,7 +30,7 @@ if [[ "${1}" == "dotcms" || -z "${1}" ]]; then
 
     cd /srv/home
 
-    DB_CONNECT_TEST="$(cat /srv/DB_CONNECT_TEST | tr -d [:space:])"
+    DB_CONNECT_TEST="$(cat /tmp/DB_CONNECT_TEST | tr -d [:space:])"
     if [[ -n "$DB_CONNECT_TEST" ]]; then
         exec -- \
         /usr/local/bin/dockerize -wait tcp://${DB_CONNECT_TEST} -timeout 60s \
diff --git a/images/dotcms/ROOT/srv/templates/dotcms/OVERRIDE/META-INF/context.xml b/images/dotcms/ROOT/srv/templates/dotcms/OVERRIDE/META-INF/context.xml
index 3d62758..4f6d613 100644
--- a/images/dotcms/ROOT/srv/templates/dotcms/OVERRIDE/META-INF/context.xml
+++ b/images/dotcms/ROOT/srv/templates/dotcms/OVERRIDE/META-INF/context.xml
@@ -3,6 +3,14 @@
     <Loader delegate="true"/><!--https://issues.apache.org/bugzilla/show_bug.cgi?id=55943#c13-->
     <Resource name="mail/MailSession" auth="Container" type="javax.mail.Session" mail.smtp.host="{{ .Env.CMS_SMTP_HOST }}" />
 
+    <!-- http://tomcat.apache.org/tomcat-8.0-doc/config/jar-scanner.html -->
+    <!-- http://tomcat.apache.org/tomcat-8.0-doc/config/jar-scan-filter.html -->
+    <JarScanner>
+        <JarScanFilter
+            pluggabilitySkip="${tomcat.util.scan.StandardJarScanFilter.jarsToSkip},ojdbc*.jar"
+            tldSkip="${tomcat.util.scan.StandardJarScanFilter.jarsToSkip},ojdbc*.jar"/>
+    </JarScanner>
+
     {{ if eq .Env.PROVIDER_DB_DRIVER "H2" }}
     <!-- H2 -->
     <Resource name="jdbc/dotCMSPool" auth="Container"