diff --git a/alfresco/Dockerfile b/alfresco/Dockerfile
index 82b8936..eecff24 100755
--- a/alfresco/Dockerfile
+++ b/alfresco/Dockerfile
@@ -6,9 +6,12 @@ ENV LC_ALL C.UTF-8 \
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
-RUN mkdir -p $TOMCAT_DIR/amps
+# Logs always under $TOMCAT/logs folder
+RUN echo "cd $TOMCAT_DIR/logs" > $TOMCAT_DIR/bin/setenv.sh \
+    && chmod +x $TOMCAT_DIR/bin/setenv.sh
 
 # Install modules and addons
+RUN mkdir -p $TOMCAT_DIR/amps
 COPY modules/amps $TOMCAT_DIR/amps
 COPY modules/jars $TOMCAT_DIR/webapps/alfresco/WEB-INF/lib
 
diff --git a/share/Dockerfile b/share/Dockerfile
index b4e994e..3559960 100755
--- a/share/Dockerfile
+++ b/share/Dockerfile
@@ -2,8 +2,12 @@ FROM alfresco/alfresco-share:6.0
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
-RUN mkdir -p $TOMCAT_DIR/amps_share
+# Logs always under $TOMCAT/logs folder
+RUN echo "cd $TOMCAT_DIR/logs" > $TOMCAT_DIR/bin/setenv.sh \
+    && chmod +x $TOMCAT_DIR/bin/setenv.sh
 
+# Install modules and addons
+RUN mkdir -p $TOMCAT_DIR/amps_share
 COPY modules/amps_share $TOMCAT_DIR/amps_share
 COPY modules/jars $TOMCAT_DIR/webapps/share/WEB-INF/lib
 
diff --git a/volumes/config/alfresco-global.properties b/volumes/config/alfresco-global.properties
index 867d5bd..b661e98 100644
--- a/volumes/config/alfresco-global.properties
+++ b/volumes/config/alfresco-global.properties
@@ -1,3 +1,6 @@
+# Required to isolate logs folder
+dir.root=/usr/local/tomcat/alf_data
+
 # Copied from https://github.com/Alfresco/acs-community-packaging/blob/master/docker-alfresco/Dockerfile
 alfresco-pdf-renderer.root=/usr/bin/
 alfresco-pdf-renderer.exe=${alfresco-pdf-renderer.root}/alfresco-pdf-renderer