diff --git a/search-services/packaging/Dockerfile b/search-services/packaging/Dockerfile
index 65ea892e2..a81f646ae 100644
--- a/search-services/packaging/Dockerfile
+++ b/search-services/packaging/Dockerfile
@@ -4,7 +4,7 @@ FROM java:8
 MAINTAINER Gethin James, gethin.james@alfresco.com
 
 ARG SOLR_ZIP
-ENV DIST_DIR /opt
+ENV DIST_DIR /opt/alfresco-solr
 
 RUN groupadd -r solr && useradd -r -g solr -s /bin/bash solr
 
@@ -13,11 +13,10 @@ RUN apt-get update && apt-get install -y \
 		curl unzip lsof \
 	--no-install-recommends && rm -r /var/lib/apt/lists/*
 
-RUN mkdir -p $DIST_DIR/alfresco-solr-data
 COPY $SOLR_ZIP $DIST_DIR/
 WORKDIR $DIST_DIR
 
 RUN unzip *.zip -d $DIST_DIR/ && rm *.zip && chown -R solr:solr $DIST_DIR/*
 EXPOSE 8983
 USER solr
-CMD [ "/opt/alfresco-solr/bin/solr", "start", "-f" ]
+CMD [ "/opt/alfresco-solr/solr/bin/solr", "start", "-f" ]
diff --git a/search-services/packaging/build.sh b/search-services/packaging/build.sh
index f46feea19..7852ad5cd 100755
--- a/search-services/packaging/build.sh
+++ b/search-services/packaging/build.sh
@@ -2,6 +2,6 @@
 rm -rf target/alfresco-solr
 rm -rf target/solr-*
 export SOLR_VER=5.1-K_2-SNAPSHOT
-docker build --build-arg SOLR_ZIP=target/alfresco-solr-${SOLR_VER}.zip -t dockerreg.alfresco.com/alfresco-solr:6.0${bamboo_buildNumber} .
+docker build --build-arg SOLR_ZIP=target/alfresco-solr-${SOLR_VER}.zip -t dockerreg.alfresco.com/alfresco-solr:6.0${bamboo_buildNumber} -t dockerreg.alfresco.com/alfresco-solr:latest .
 
 echo "Now type: docker run --rm -p 8983:8983 dockerreg.alfresco.com/alfresco-solr:6.0${bamboo_buildNumber}"
diff --git a/search-services/packaging/src/assembly/solr-distribution.xml b/search-services/packaging/src/assembly/solr-distribution.xml
index ca202262b..2d69f00fe 100644
--- a/search-services/packaging/src/assembly/solr-distribution.xml
+++ b/search-services/packaging/src/assembly/solr-distribution.xml
@@ -4,12 +4,20 @@
     <formats>
         <format>zip</format>
     </formats>
-    <baseDirectory>alfresco-solr</baseDirectory>
+    <includeBaseDirectory>false</includeBaseDirectory>    
     <fileSets>
         <!-- Solr war dependency unpacked earlier to get rid of the root dir -->
         <fileSet>
             <directory>target/solr-${solr.version}</directory>
-            <outputDirectory></outputDirectory>
+            <outputDirectory>solr</outputDirectory>
+        </fileSet>
+        <!-- Just create an empty data directory -->
+        <fileSet>
+          <directory>src/assembly</directory>
+          <outputDirectory>data</outputDirectory>
+          <excludes>
+            <exclude>*</exclude>
+          </excludes>
         </fileSet>
     </fileSets>
     <dependencySets>
@@ -18,7 +26,7 @@
             <includes>
                 <include>*:alfresco-solr6:zip:config*</include>
             </includes>
-            <outputDirectory>server/solr/</outputDirectory>
+            <outputDirectory>solr/server/solr/</outputDirectory>
             <unpack>true</unpack>
             <unpackOptions>
                 <excludes>
@@ -34,7 +42,7 @@
             <includes>
                 <include>org.alfresco:alfresco-solr6:war</include>
             </includes>
-            <outputDirectory>server/solr-webapp/webapp</outputDirectory>
+            <outputDirectory>solr/server/solr-webapp/webapp</outputDirectory>
             <unpack>true</unpack>
             <unpackOptions>
                 <includes>