diff --git a/docker-compose/.env b/docker-compose/.env
index abe6b17c8..1d9c39014 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -1,4 +1,4 @@
 REPO=quay.io/
 ALFRESCO_TAG=latest
-SHARE_TAG=5.2.X
+SHARE_TAG=6.0
 
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b7683e47b..bebc68dcd 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -19,7 +19,7 @@ services:
             - 8082:8080 #Browser port
 
     share:
-        image: ${REPO}alfresco/alfresco-full-share:${SHARE_TAG}
+        image: ${REPO}alfresco/alfresco-share:${SHARE_TAG}
         environment:
             - REPO_HOST=alfresco
             - REPO_PORT=8080
diff --git a/docker-share/.maven-dockerignore b/docker-share/.maven-dockerignore
deleted file mode 100644
index 112bd1824..000000000
--- a/docker-share/.maven-dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-target/docker/
\ No newline at end of file
diff --git a/docker-share/Dockerfile b/docker-share/Dockerfile
deleted file mode 100644
index 6fff3d816..000000000
--- a/docker-share/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM quay.io/alfresco/alfresco-share:5.2.X
-
-RUN mkdir -p /usr/local/tomcat/amps_share
-
-COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/
-COPY target/amps_share /usr/local/tomcat/amps_share
-
-RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
-              /usr/local/tomcat/amps_share /usr/local/tomcat/webapps/share -directory -nobackup -force
\ No newline at end of file
diff --git a/docker-share/pom.xml b/docker-share/pom.xml
deleted file mode 100644
index ad1488d20..000000000
--- a/docker-share/pom.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community-docker-share</artifactId>
-    <name>ACS Community Docker image builder for Share</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
-        <version>6.0.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-mmt</artifactId>
-            <version>${dependency.alfresco-mmt.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco.integrations</groupId>
-            <artifactId>alfresco-googledocs-share</artifactId>
-            <version>${alfresco.googledocs.version}</version>
-            <type>amp</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-mmt</artifactId>
-                                    <version>${dependency.alfresco-mmt.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.alfresco.integrations</groupId>
-                                    <artifactId>alfresco-googledocs-share</artifactId>
-                                    <version>${alfresco.googledocs.version}</version>
-                                    <type>amp</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/amps_share</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-    <profiles>
-        <profile>
-            <id>communityDocker</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>alfresco/alfresco-full-share</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>local</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>install</phase>
-                                <id>build</id>
-                                <goals>
-                                    <goal>build</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>dockerImages</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <version>${dependency.fabric8.version}</version>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>alfresco/alfresco-full-share</name>
-                                    <registry>quay.io</registry>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>buildAndPush</id>
-                                <goals>
-                                    <goal>build</goal>
-                                    <goal>push</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
\ No newline at end of file
diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
index 7eeff2aae..ffb2d9cf3 100644
--- a/helm/alfresco-content-services/values.yaml
+++ b/helm/alfresco-content-services/values.yaml
@@ -30,8 +30,8 @@ repository:
 share:
   replicaCount: 1
   image:
-    repository: quay.io/alfresco/alfresco-full-share
-    tag: "5.2.X"
+    repository: quay.io/alfresco/alfresco-share
+    tag: "6.0"
     pullPolicy: Always
     internalPort: 8080
   service:
diff --git a/pom.xml b/pom.xml
index 2f7547f01..2f0d66043 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,6 @@
             <modules>
                 <module>war</module>
                 <module>docker-alfresco</module>
-                <module>docker-share</module>
             </modules>
         </profile>
         <profile>
@@ -37,7 +36,6 @@
                 <module>distribution</module>
                 <module>public-javadoc</module>
                 <module>docker-alfresco</module>
-                <module>docker-share</module>
             </modules>
         </profile>
     </profiles>