diff --git a/alfresco-content-repository/docker/Dockerfile b/alfresco-content-repository/docker/Dockerfile
index 7b15987..c31f7d4 100644
--- a/alfresco-content-repository/docker/Dockerfile
+++ b/alfresco-content-repository/docker/Dockerfile
@@ -10,7 +10,7 @@ COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.
 COPY *.amp ${TOMCAT_DIR}/amps/
 
 RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \
-	mkdir -p ${TOMCAT_DIR}/modules && \
+	mkdir -p ${TOMCAT_DIR}/modules/platform && \
 	cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
 
 USER ${USERNAME}
diff --git a/alfresco-content-repository/docker/tomcat-platform-context.xml b/alfresco-content-repository/docker/tomcat-platform-context.xml
index d373c25..2759e98 100644
--- a/alfresco-content-repository/docker/tomcat-platform-context.xml
+++ b/alfresco-content-repository/docker/tomcat-platform-context.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Context>
         <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
+                <PreResources base="${catalina.base}/modules/platform" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
         </Resources>
 </Context>
-
diff --git a/alfresco-share/docker/Dockerfile b/alfresco-share/docker/Dockerfile
index 76d9aa3..2b8b910 100644
--- a/alfresco-share/docker/Dockerfile
+++ b/alfresco-share/docker/Dockerfile
@@ -6,5 +6,5 @@ COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml
 COPY *.amp ${TOMCAT_DIR}/amps_share/
 
 RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory && \
-	mkdir -p ${TOMCAT_DIR}/modules
+	mkdir -p ${TOMCAT_DIR}/modules/share
 
diff --git a/alfresco-share/docker/tomcat-share-context.xml b/alfresco-share/docker/tomcat-share-context.xml
index d373c25..2f0e5e0 100644
--- a/alfresco-share/docker/tomcat-share-context.xml
+++ b/alfresco-share/docker/tomcat-share-context.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Context>
         <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
+                <PreResources base="${catalina.base}/modules/share" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
         </Resources>
 </Context>
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c0bc81..85c9539 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,7 +46,7 @@ services:
             - postgres-acs
             - activemq
         volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
+            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro"
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
@@ -69,7 +69,7 @@ services:
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 "
         volumes:
-            - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"
+            - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro"
     
     postgres-acs:
         image: postgres:11.7