diff --git a/search-services/packaging/build.sh b/search-services/packaging/build.sh
index 7852ad5cd..ececceaa3 100755
--- a/search-services/packaging/build.sh
+++ b/search-services/packaging/build.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 rm -rf target/alfresco-solr
 rm -rf target/solr-*
-export SOLR_VER=5.1-K_2-SNAPSHOT
+export SOLR_VER=1.0-SNAPSHOT
 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/pom.xml b/search-services/packaging/pom.xml
index 481c28649..2966e18b5 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -19,16 +19,9 @@
       <dependency>
           <groupId>org.alfresco</groupId>
           <artifactId>alfresco-solr6</artifactId>
-          <version>${alfresco-solr.version}</version>
+          <version>${project.version}</version>
           <type>war</type>
       </dependency>
-      <dependency>
-          <groupId>org.alfresco</groupId>
-          <artifactId>alfresco-solr6</artifactId>
-          <version>${alfresco-solr.version}</version>
-          <classifier>config-sharding</classifier>
-          <type>zip</type>
-      </dependency>
     </dependencies>
     <build>
         <finalName>alfresco-solr-${project.version}</finalName>
@@ -57,6 +50,25 @@
                         </artifactItems>
                       </configuration>
                   </execution>
+                  <execution>
+                      <id>unpack-solr-config</id>
+                      <phase>validate</phase>
+                      <goals>
+                          <goal>unpack</goal>
+                      </goals>
+                      <configuration>
+                          <artifactItems>
+                              <artifactItem>
+                                  <groupId>org.alfresco</groupId>
+                                  <artifactId>alfresco-solr6</artifactId>
+                                  <version>${project.version}</version>
+                                  <classifier>classes</classifier>
+                                  <outputDirectory>${project.build.directory}</outputDirectory>
+                                  <includes>solr/instance/**/*</includes>
+                              </artifactItem>
+                          </artifactItems>
+                      </configuration>
+                  </execution>
               </executions>
           </plugin>
             <plugin>
diff --git a/search-services/packaging/src/assembly/solr-distribution.xml b/search-services/packaging/src/assembly/solr-distribution.xml
index 2d69f00fe..1bfad2755 100644
--- a/search-services/packaging/src/assembly/solr-distribution.xml
+++ b/search-services/packaging/src/assembly/solr-distribution.xml
@@ -11,6 +11,16 @@
             <directory>target/solr-${solr.version}</directory>
             <outputDirectory>solr</outputDirectory>
         </fileSet>
+        <!-- Solr config -->
+        <fileSet>
+            <directory>target/solr/instance</directory>
+            <outputDirectory>solr/server/solr/</outputDirectory>
+            <excludes>
+                <exclude>**/workspace-SpacesStore/**</exclude>
+                <exclude>**/archive-SpacesStore/**</exclude>
+                <exclude>context.xml</exclude>
+            </excludes>
+        </fileSet>
         <!-- Just create an empty data directory -->
         <fileSet>
           <directory>src/assembly</directory>
@@ -21,14 +31,17 @@
         </fileSet>
     </fileSets>
     <dependencySets>
-        <!-- Solr config -->
-        <dependencySet>
+
+        <!--dependencySet>
             <includes>
-                <include>*:alfresco-solr6:zip:config*</include>
+                <include>org.alfresco:alfresco-solr6:jar:classes*</include>
             </includes>
             <outputDirectory>solr/server/solr/</outputDirectory>
             <unpack>true</unpack>
             <unpackOptions>
+                <includes>
+                    <include>solr/instance/**.*</include>
+                </includes>
                 <excludes>
                     <exclude>**/workspace-SpacesStore/**</exclude>
                     <exclude>**/archive-SpacesStore/**</exclude>
@@ -37,7 +50,7 @@
             </unpackOptions>
             <useStrictFiltering>true</useStrictFiltering>
             <useProjectArtifact>false</useProjectArtifact>
-        </dependencySet>
+        </dependencySet-->
         <dependencySet>
             <includes>
                 <include>org.alfresco:alfresco-solr6:war</include>