diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile
index 0b60061ad4..18d450fa30 100644
--- a/rm-community/rm-community-repo/Dockerfile
+++ b/rm-community/rm-community-repo/Dockerfile
@@ -1,6 +1,10 @@
+
+
 FROM alfresco/alfresco-content-repository-community:latest
 
-COPY target/alfresco-rm-community-repo-*.amp /usr/local/tomcat/amps/
+ARG TOMCAT_DIR=/usr/local/tomcat
 
-RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
-              /usr/local/tomcat/amps/alfresco-rm-community-repo-*.amp /usr/local/tomcat/webapps/alfresco -nobackup
+COPY target/alfresco-rm-community-repo-*.amp $TOMCAT_DIR/amps/
+
+RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
+              $TOMCAT_DIR/amps/alfresco-rm-community-repo-*.amp $TOMCAT_DIR/webapps/alfresco -nobackup
diff --git a/rm-community/rm-community-repo/docker-compose.yml b/rm-community/rm-community-repo/docker-compose.yml
index dd25d6719d..05ab6bd24a 100644
--- a/rm-community/rm-community-repo/docker-compose.yml
+++ b/rm-community/rm-community-repo/docker-compose.yml
@@ -1,12 +1,10 @@
 version: "3"
 
-# The acs-community-deployment project contains the product version of docker-compose.
-#
-# This version is for testing and development use. For testing and debug we need to have a more open version.
 # For remote debug we need the CATALINA_OPTS and to expose port 8000.
 
 services:
     alfresco:
+    # acs repo community image with ags repo community amp applied
         image: alfresco/ags-repo-community:latest
         environment:
             CATALINA_OPTS : "
@@ -30,7 +28,7 @@ services:
                 -Dcifs.enabled=true
                 "
         ports:
-            - 8082:8080
+            - 8080:8080
             - 8000:8000
             - 445:445
             - 143:143
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index e5bc2ec355..72a24a28a9 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -656,6 +656,7 @@
             </plugins>
          </build>
       </profile>
+       <!--Docker profiles used to build specific docker images for community repo, defined in parent pom -->
        <profile>
            <id>buildDockerImage</id>
            <build>