diff --git a/README.md b/README.md
index 287f366..c814e84 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ All of it is data. None of it ships in the binary.
 | `elasticsearch` | Elasticsearch single-node engine |
 | `opensearch` | OpenSearch single-node engine |
 | `typesense` | Typesense typo-tolerant search |
+| `solr` | Apache Solr, the search backend Drupal and TYPO3 expect |
 
 **Cache, queues & messaging**
 
diff --git a/schema/2/services/index.json b/schema/2/services/index.json
index f34965f..520d462 100644
--- a/schema/2/services/index.json
+++ b/schema/2/services/index.json
@@ -327,6 +327,16 @@
       "category": "messaging",
       "icon": "broadcast"
     },
+    {
+      "name": "solr",
+      "description": "Apache Solr search platform, used by Drupal and TYPO3",
+      "family": "solr",
+      "dashboard": "http://localhost:8983/solr/",
+      "image": "docker.io/library/solr:9",
+      "category": "search",
+      "icon": "search",
+      "color": "#d9411e"
+    },
     {
       "name": "stripe-mock",
       "description": "Local Stripe API mock for Cashier and webhook testing",
diff --git a/schema/2/services/solr.yaml b/schema/2/services/solr.yaml
new file mode 100644
index 0000000..4eddbb5
--- /dev/null
+++ b/schema/2/services/solr.yaml
@@ -0,0 +1,24 @@
+name: solr
+image: docker.io/library/solr:9
+update_strategy: rolling
+description: Apache Solr search platform, used by Drupal and TYPO3
+family: solr
+ports:
+- 8983:8983
+data_dir: /var/solr
+environment:
+  SOLR_MODULES: analysis-extras
+chown_data: true
+dashboard: http://localhost:8983/solr/
+dashboard_proxy_strip: true
+site_init:
+  exec: solr create -c {{site}} 2>/dev/null || true
+env_vars:
+- SOLR_HOST=lerd-solr
+- SOLR_PORT=8983
+- SOLR_CORE={{site}}
+client_shims:
+- solr
+category: search
+icon: search
+color: '#d9411e'
diff --git a/services/index.json b/services/index.json
index edf5f21..9ba7d57 100644
--- a/services/index.json
+++ b/services/index.json
@@ -325,6 +325,15 @@
       "category": "messaging",
       "icon": "broadcast"
     },
+    {
+      "name": "solr",
+      "description": "Apache Solr search platform, used by Drupal and TYPO3",
+      "family": "solr",
+      "image": "docker.io/library/solr:9",
+      "category": "search",
+      "icon": "search",
+      "color": "#d9411e"
+    },
     {
       "name": "stripe-mock",
       "description": "Local Stripe API mock for Cashier and webhook testing",
diff --git a/services/solr.svg b/services/solr.svg
new file mode 100644
index 0000000..066b9a7
--- /dev/null
+++ b/services/solr.svg
@@ -0,0 +1,10 @@
+<svg viewBox="138.3 2.4 66.6 66.7" xmlns="http://www.w3.org/2000/svg">
+<path d="M196.2,13l-33,35.7l41.5-19.1C203.5,23.2,200.5,17.5,196.2,13z"/>
+<path d="M171.7,2.4c-4.6,0-8.9,0.9-12.9,2.6l-4.4,37.3l22.1-39.5C175,2.5,173.4,2.4,171.7,2.4z"/>
+<path d="M205,31.6l-39.3,22l36.9-4.4c1.7-4.1,2.7-8.5,2.7-13.2C205.3,34.5,205.2,33,205,31.6z"/>
+<path d="M190.5,63.8c4.4-3,8-7,10.6-11.6L166.6,59L190.5,63.8z"/>
+<path d="M178.6,3.1l-19.2,41.7l35.7-33C190.5,7.5,184.9,4.4,178.6,3.1z"/>
+<path d="M174.6,69.4c3.7-0.3,7.3-1.2,10.5-2.6l-19.4-2.3L174.6,69.4z"/>
+<path d="M141.1,22.2c-1.5,3.3-2.5,7-2.8,10.8l5.2,9.3L141.1,22.2z"/>
+<path d="M155.9,6.3c-4.7,2.5-8.8,6.2-11.8,10.6l4.9,24.5L155.9,6.3z"/>
+</svg>
diff --git a/services/solr.yaml b/services/solr.yaml
new file mode 100644
index 0000000..3561ec7
--- /dev/null
+++ b/services/solr.yaml
@@ -0,0 +1,22 @@
+name: solr
+image: docker.io/library/solr:9
+update_strategy: rolling
+description: Apache Solr search platform, used by Drupal and TYPO3
+family: solr
+ports:
+- 8983:8983
+data_dir: /var/solr
+environment:
+  SOLR_MODULES: analysis-extras
+chown_data: true
+site_init:
+  exec: solr create -c {{site}} 2>/dev/null || true
+env_vars:
+- SOLR_HOST=lerd-solr
+- SOLR_PORT=8983
+- SOLR_CORE={{site}}
+client_shims:
+- solr
+category: search
+icon: search
+color: '#d9411e'