diff --git a/docs/rabbitmq.md b/docs/rabbitmq.md
index 1c748b2..2d47a66 100644
--- a/docs/rabbitmq.md
+++ b/docs/rabbitmq.md
@@ -17,7 +17,7 @@ variable `CPHP_SERVICE_RABBITMQ` with the desired RabbitMQ version as value to y
 E.g. if you need `RabbitMQ 3.7.5` in your Behat tests, go to the Testing Settings (step 2 of the Pipeline) and add the
 environment variable `CPHP_SERVICE_RABBITMQ = 3.7.5` to the Behat configuration.
 
-## Connecting to elasticsearch
+## Connecting to RabbitMQ
 
 <table>
   <tr>
diff --git a/docs/solr.md b/docs/solr.md
new file mode 100644
index 0000000..c46b899
--- /dev/null
+++ b/docs/solr.md
@@ -0,0 +1,38 @@
+---
+layout:         doc
+title:          "SolR - Documentation"
+category:       "queues"
+order:          3
+excerpt:        "SolR support by continuousphp"
+---
+[SolR](https://lucene.apache.org/solr/) is supported by continuousphp.
+
+## Specification
+
+SolR containers are available for each activity in your build. To enable one of them, simply add the environment
+variable `CPHP_SERVICE_SOLR` with the desired SolR version as value to your pipeline configuration. Available versions are :
+
+* ***8.4***
+* ***8.3***
+* ***8.2***
+* ***8.1***
+* ***8.0***
+* ***7.7***
+* ***7.6***
+* ***7.5***
+* ***6.6***
+* ***5.5***
+
+E.g. if you need `SolR 8.0` in your Behat tests, go to the Testing Settings (step 2 of the Pipeline) and add the
+environment variable `CPHP_SERVICE_SOLR = 8.0` to the Behat configuration.
+
+## Connecting to SolR
+
+<table>
+  <tr>
+    <td>Host</td><td>solr</td>
+  </tr>
+  <tr>
+    <td>Port</td><td>8983</td>
+  </tr>
+</table>
diff --git a/mkdocs.yml b/mkdocs.yml
index 3ee7ec0..0857d12 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -115,6 +115,7 @@ nav:
             - Web Servers: webserver.md
             - Other services:
                 - ElasticSearch: elasticsearch.md
+                - SolR: solr.md
                 - RabbitMQ: rabbitmq.md
         - Use various tools:
             - Ruby versions: ruby.md