diff --git a/docker-compose.yml b/docker-compose.yml
index cb48224b8..317c5ff1e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
      - "8983:8983"
     links:
       - zookeeper
-    command: "bash -c '/opt/solr/bin/solr start -f -z zookeeper:2181 -Dbootstrap_confdir=/solr-config/index/conf'"
+    command: "bash -c './post-hooks.sh & /opt/solr/bin/solr start -f -z zookeeper:2181 -Denable.packages=true -Dbootstrap_confdir=/solr-config/index/conf'"
 
   solr-proxy:
     build: ./solr-proxy
diff --git a/ocr/init/init.sh b/ocr/init/init.sh
index 69caabbaf..f8c81b197 100755
--- a/ocr/init/init.sh
+++ b/ocr/init/init.sh
@@ -6,8 +6,9 @@
 #	sleep 5
 #done
 #echo "Sleeping 15"
-#sleep 15
+sleep 15
 ./wait-for-solr.sh --max-attempts 10 --wait-seconds 4 --solr-url http://solr:8983
+sleep 30
 
 #echo "Uploading security.json to ZK"
 #/opt/solr/server/scripts/cloud-scripts/zkcli.sh -zkhost zookeeper:2181 -cmd putfile /security.json /code/security.json
diff --git a/solr/Dockerfile b/solr/Dockerfile
index e4ec612a6..19666ae22 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:8.5
+FROM solr:8.6.2
 
 # Add Tesseract
 USER root
@@ -12,8 +12,9 @@ RUN mkdir -p /home/solr/ # Cache dir for fonts from Tika.
 RUN chown -R 8983:8983 /home/solr
 
 # Add Solr customizations
-ADD lib/*.jar /opt/solr/server/solr-webapp/webapp/WEB-INF/lib/
 ADD web.xml /opt/solr/server/solr-webapp/webapp/WEB-INF
+ADD post-hooks.sh /opt/solr
+RUN chmod +x /opt/solr/post-hooks.sh
 
 COPY solr-home /solr-config
 ADD set_heap.sh /docker-entrypoint-initdb.db
diff --git a/solr/lib/offset-hl-formatter-1.0.1-solr7.1.0-SNAPSHOT.jar b/solr/lib/offset-hl-formatter-1.0.1-solr7.1.0-SNAPSHOT.jar
deleted file mode 100644
index be56dc4af..000000000
Binary files a/solr/lib/offset-hl-formatter-1.0.1-solr7.1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/solr/lib/solr-payloads-1.0.3-solr7.1.0-SNAPSHOT.jar b/solr/lib/solr-payloads-1.0.3-solr7.1.0-SNAPSHOT.jar
deleted file mode 100644
index 3cb00a97e..000000000
Binary files a/solr/lib/solr-payloads-1.0.3-solr7.1.0-SNAPSHOT.jar and /dev/null differ
diff --git a/solr/post-hooks.sh b/solr/post-hooks.sh
new file mode 100644
index 000000000..b22994610
--- /dev/null
+++ b/solr/post-hooks.sh
@@ -0,0 +1,6 @@
+wait-for-solr.sh --max-attempts 25 --wait-seconds 4 --solr-url http://solr:8983
+
+bin/solr package add-repo osc https://raw.githubusercontent.com/o19s/payload-component/master/repo
+bin/solr package install solr-payloads:1.1.4
+
+
diff --git a/solr/solr-home/index/conf/schema.xml b/solr/solr-home/index/conf/schema.xml
index 64a01051f..295a67e46 100644
--- a/solr/solr-home/index/conf/schema.xml
+++ b/solr/solr-home/index/conf/schema.xml
@@ -61,13 +61,13 @@
     <fieldType name="ocr" stored="false" indexed="true" class="solr.TextField">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="com.o19s.payloads.Base64Encoder" />
+        <filter class="solr.DelimitedPayloadTokenFilterFactory" encoder="solr-payloads:com.o19s.payloads.Base64Encoder" />
         <!-- The payload buffer works around WDF removing payloads from tokens by copying and replacing later in the chain -->
-        <filter class="com.o19s.payloads.filter.PayloadBufferFilterFactory" />
+        <filter class="solr-payloads:com.o19s.payloads.filter.PayloadBufferFilterFactory" />
         <filter class="solr.LowerCaseFilterFactory" />
         <filter class="solr.WordDelimiterFilterFactory" />
         <filter class="solr.KStemFilterFactory" />
-        <filter class="com.o19s.payloads.filter.PayloadBufferFilterFactory" />
+        <filter class="solr-payloads:com.o19s.payloads.filter.PayloadBufferFilterFactory" />
       </analyzer>
     </fieldType>
 
diff --git a/solr/solr-home/index/conf/solrconfig.xml b/solr/solr-home/index/conf/solrconfig.xml
index d3ad237c0..0b4e2ca38 100644
--- a/solr/solr-home/index/conf/solrconfig.xml
+++ b/solr/solr-home/index/conf/solrconfig.xml
@@ -21,7 +21,7 @@
  It is *not* a good example to work from.
 -->
 <config>
-  <luceneMatchVersion>7.1</luceneMatchVersion>
+  <luceneMatchVersion>8.6</luceneMatchVersion>
 
   <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
   <lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
@@ -150,7 +150,7 @@
   </admin>
 
 
-  <searchComponent class="com.o19s.payloads.component.PayloadComponent" name="payload" />
+  <searchComponent class="solr-payloads:com.o19s.payloads.component.PayloadComponent" name="payload" />
     <!-- Highlighting Component
 
        http://wiki.apache.org/solr/HighlightingParameters
@@ -185,7 +185,7 @@
       <!-- Configure the standard formatter -->
       <formatter name="html"
                  default="true"
-                 class="com.o19s.labs.OffsetFormatter">
+                 class="solr-payloads:com.o19s.hl.OffsetFormatter">
       </formatter>
 
       <!-- Configure the standard encoder -->