diff --git a/search-services/packaging/docker-compose.yml b/search-services/packaging/docker-compose.yml
index 2c904dd76..c3b96280f 100644
--- a/search-services/packaging/docker-compose.yml
+++ b/search-services/packaging/docker-compose.yml
@@ -30,4 +30,4 @@ services:
     ports:
       - "8083:8983" #Browser port
       - "1044:1044" #Java debugging
-#In the Index Server Shard Management Admin console the index server is: localhost:8083/solr
+#In the Index Server Shard Management Admin console the index server is: solr6:8983/solr
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index 10f5045d0..bfb5a5612 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -10,6 +10,9 @@
       <alfresco.solr.config># Alfresco configuration
 # This file is automatically included by solr. You can define your custom settings here
 SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000"</alfresco.solr.config>
+      <alfresco.solr.config.win>REM Alfresco configuration
+REM This file is automatically included by solr. You can define your custom settings here
+set SOLR_OPTS=%SOLR_OPTS% -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.threads.stop.timeout=300000</alfresco.solr.config.win>
     </properties>
     <parent>
         <groupId>org.alfresco</groupId>
@@ -125,12 +128,21 @@ SOLR_OPTS="$SOLR_OPTS -Dsolr.jetty.request.header.size=1000000 -Dsolr.jetty.thre
                                 <replace token= "SOLR_SERVER_DIR/solr" value="SOLR_TIP/../solrhome" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr"/>
                                 </replace>
+                                <replace token= "%SOLR_SERVER_DIR%\solr" value="%SOLR_TIP%\..\solrhome" dir="target/solr-${solr.version}">
+                                    <include name="**/bin/solr.cmd"/>
+                                </replace>
                                 <replace token= "HOME/.solr.in.sh" value="SOLR_TIP/../solr.in.sh" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr"/>
                                 </replace>
+                                <replace token= "\bin\solr.in.cmd" value="\..\solr.in.cmd" dir="target/solr-${solr.version}">
+                                    <include name="**/bin/solr.cmd"/>
+                                </replace>
                                 <replace token= "# Set the thread stack size" value="${alfresco.solr.config}${line.separator}${line.separator}# Set the thread stack size" dir="target/solr-${solr.version}">
                                     <include name="**/bin/solr.in.sh"/>
                                 </replace>
+                                <replace token= "REM Set the thread stack size" value="${alfresco.solr.config.win}${line.separator}${line.separator}REM Set the thread stack size" dir="target/solr-${solr.version}">
+                                    <include name="**/bin/solr.in.cmd"/>
+                                </replace>
                                 <chmod file="target/solr-${solr.version}/bin/solr" perm="755"/>
                             </target>
                         </configuration>
diff --git a/search-services/packaging/src/assembly/solr-distribution.xml b/search-services/packaging/src/assembly/solr-distribution.xml
index 778728e58..08340f879 100644
--- a/search-services/packaging/src/assembly/solr-distribution.xml
+++ b/search-services/packaging/src/assembly/solr-distribution.xml
@@ -11,6 +11,7 @@
             <outputDirectory>.</outputDirectory>
             <includes>
                 <include>solr.in.sh</include>
+                <include>solr.in.cmd</include>
             </includes>
         </fileSet>
         <!-- Solr war dependency unpacked earlier to get rid of the root dir -->
@@ -21,6 +22,7 @@
                 <exclude>**/server/solr/**</exclude>
                 <exclude>**/example/**</exclude>
                 <exclude>**/bin/solr.in.sh</exclude>
+                <exclude>**/bin/solr.in.cmd</exclude>
             </excludes>
         </fileSet>
         <!-- Solr config -->