diff --git a/search-services/.gitignore b/search-services/.gitignore
index 90bfd4abd..76769f2cd 100644
--- a/search-services/.gitignore
+++ b/search-services/.gitignore
@@ -25,3 +25,4 @@ tlog
 _DEFAULT_
 .recommenders/
 /packaging/src/docker/alfresco-solr-distribution*.zip
+/packaging/src/docker/alfresco-search-services*.zip
diff --git a/search-services/README.MD b/search-services/README.MD
index 0bd979d25..2ac1463f5 100644
--- a/search-services/README.MD
+++ b/search-services/README.MD
@@ -16,7 +16,8 @@ mvn clean install
 ### Docker
 To build the docker image, first run the maven build then
 ```
-cd packaging
+cd packaging/src/docker
+export bamboo_planRepository_1_branch=local
 ./buildAndTest.sh
 ```
 
diff --git a/search-services/packaging/buildAndTest.sh b/search-services/packaging/buildAndTest.sh
index 4351db856..3f022349b 100755
--- a/search-services/packaging/buildAndTest.sh
+++ b/search-services/packaging/buildAndTest.sh
@@ -7,12 +7,12 @@ set -e
 cd "$(dirname "$0")"
 
 nicebranch=`echo "$bamboo_planRepository_1_branch" | sed 's/\//_/'`
-dockerImage="docker-internal.alfresco.com/alfresco-solr:${nicebranch}-latest"
+dockerImage="docker-internal.alfresco.com/search-services:${nicebranch}-latest"
 
 echo "Building $dockerImage..."
 
-rm -f src/docker/alfresco-solr-distribution-*.zip
-cp target/alfresco-solr-distribution-*.zip src/docker
+rm -f src/docker/alfresco-search-services-*.zip
+cp target/alfresco-search-services-*.zip src/docker
 docker build -t $dockerImage src/docker
 
 # running tests
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 1c2a2f1e1..394f2258f 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -1,9 +1,10 @@
 <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>
     <groupId>org.alfresco</groupId>
-    <artifactId>alfresco-solr-distribution</artifactId>
-    <name>Alfresco Solr Distribution</name>
-    <description>Produces the solr distribution zip</description>
+    <artifactId>alfresco-search-services</artifactId>
+    <name>Alfresco Search Services</name>
+    <description>Alfresco Search Services Solr distribution zip</description>
+    <packaging>jar</packaging>
     <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -28,7 +29,7 @@
         </dependency>
     </dependencies>
     <build>
-        <finalName>alfresco-solr-distribution-${project.version}</finalName>
+        <finalName>alfresco-search-services-${project.version}</finalName>
         <plugins>
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
diff --git a/search-services/packaging/src/assembly/solr-distribution.xml b/search-services/packaging/src/assembly/solr-distribution.xml
index 08340f879..4562eba7c 100644
--- a/search-services/packaging/src/assembly/solr-distribution.xml
+++ b/search-services/packaging/src/assembly/solr-distribution.xml
@@ -6,6 +6,11 @@
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
+        <fileSet>
+            <directory>${project.build.outputDirectory}</directory>
+            <outputDirectory>.</outputDirectory>
+            <filtered>true</filtered>
+        </fileSet>
         <fileSet>
             <directory>target/solr-${solr.version}/bin</directory>
             <outputDirectory>.</outputDirectory>
diff --git a/search-services/packaging/src/docker/Dockerfile b/search-services/packaging/src/docker/Dockerfile
index 5f6528192..99dd09604 100644
--- a/search-services/packaging/src/docker/Dockerfile
+++ b/search-services/packaging/src/docker/Dockerfile
@@ -3,7 +3,7 @@
 FROM openjdk:8
 MAINTAINER Gethin James, gethin.james@alfresco.com
 
-ENV SOLR_ZIP alfresco-solr-distribution-*.zip
+ENV SOLR_ZIP alfresco-search-services-*.zip
 ENV DIST_DIR /opt/alfresco-solr
 
 RUN groupadd -r solr && useradd -m -r -g solr -s /bin/bash solr
diff --git a/search-services/packaging/src/docker/compose-ssl.yml b/search-services/packaging/src/docker/compose-ssl.yml
index 46c8e592d..5a06c6cfb 100644
--- a/search-services/packaging/src/docker/compose-ssl.yml
+++ b/search-services/packaging/src/docker/compose-ssl.yml
@@ -17,7 +17,7 @@ services:
     environment:
       - "REPO_HOST=repo:8080"
   solr6:
-    image: docker-internal.alfresco.com/alfresco-solr:develop-latest
+    image: docker-internal.alfresco.com/search-services:develop-latest
     command: [ "/opt/alfresco-solr/solr/bin/solr", "start", "-f", "-a",
                "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"]
     environment:
diff --git a/search-services/packaging/src/docker/docker-compose.yml b/search-services/packaging/src/docker/docker-compose.yml
index c3b96280f..efaffa264 100644
--- a/search-services/packaging/src/docker/docker-compose.yml
+++ b/search-services/packaging/src/docker/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     environment:
       - "REPO_HOST=repo:8080"
   solr6:
-    image: docker-internal.alfresco.com/alfresco-solr:develop-latest
+    image: docker-internal.alfresco.com/search-services:develop-latest
     command: [ "/opt/alfresco-solr/solr/bin/solr", "start", "-f", "-a",
                "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"]
     environment:
diff --git a/search-services/packaging/src/main/resources/README.MD b/search-services/packaging/src/main/resources/README.MD
new file mode 100644
index 000000000..746993aba
--- /dev/null
+++ b/search-services/packaging/src/main/resources/README.MD
@@ -0,0 +1,30 @@
+## Alfresco Search Services
+Alfresco Search Services ${project.version} using Alfresco ${alfresco-solr.version} and Apache Solr ${solr.version}
+
+### Install & Run
+To run, unzip then
+```
+solr/bin/solr start
+```
+
+### License
+Copyright (C) 2016 Alfresco Software Limited
+
+This file is part of an unsupported extension to Alfresco.
+
+Alfresco Software Limited licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+#### Build ${maven.build.timestamp}
+${bamboo_planName} ${bamboo_fullBuildKey} ${bamboo_buildNumber}
\ No newline at end of file