diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile
index 18d450fa30..1ffc5a1ecb 100644
--- a/rm-community/rm-community-repo/Dockerfile
+++ b/rm-community/rm-community-repo/Dockerfile
@@ -1,10 +1,6 @@
+FROM alfresco/alfresco-content-repository-community:6.0.7-ga
 
+COPY target/alfresco-rm-community-repo-*.amp /usr/local/tomcat/amps/
 
-FROM alfresco/alfresco-content-repository-community:latest
-
-ARG TOMCAT_DIR=/usr/local/tomcat
-
-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
+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