diff --git a/Makefile b/Makefile
index a8bed85..e5c2dbf 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,13 @@ dv_clean:  ## Cleans old dv files
 	@echo "plone: $(plone)"
 	bin/$(instance) -O$(plone) run run-scripts.py 2
 
+.PHONY: solr-compose
+solr-compose:  ## Start solr container (foreground)
+	@if [ -d solr ] && [ "$$(stat -c %a solr)" != "777" ]; then \
+		sudo chmod -R 777 solr; \
+	fi
+	docker compose up solr
+
 .PHONY: solr-setup
 solr-setup:  ## Solr setup
 	@echo "plone: $(plone)"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..f124f1f
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,7 @@
+services:
+  solr:
+    image: solr:9-slim
+    ports:
+      - "8983:8983"
+    volumes:
+      - ./solr:/var/solr/data/plone
diff --git a/port.cfg b/port.cfg
index 9a6ec02..f1b4c54 100644
--- a/port.cfg
+++ b/port.cfg
@@ -21,6 +21,10 @@ oo-port = 2002
 solr-host = localhost
 solr-port = 8983
 solr-base = /solr/plone
+solr-login = solr
+solr-password = SolrRocks
+solr-https-connection = false
+solr-ignore-certificate-check = false
 python-uno = /usr/bin/python3
 zodb-cache-size = 30000
 zeo-client-cache-size = 300MB
diff --git a/solr.cfg b/solr.cfg
index e57fb32..ce318ae 100644
--- a/solr.cfg
+++ b/solr.cfg
@@ -16,7 +16,8 @@ Genshi = 0.7.1
 collective.indexing = 2.1
 collective.js.showmore = 1.0a4
 collective.recipe.solrinstance = 5.3.3
-collective.solr = 8.4.2
+collective.recipe.template = 2.2
+;collective.solr = 8.4.2
 gocept.download = 0.9.5
 hexagonit.recipe.download = 1.7.1
 kitconcept.recipe.solr = 1.0.0a5
@@ -27,9 +28,13 @@ eggs+=
     collective.indexing
 
 environment-vars +=
-    COLLECTIVE_SOLR_HOST ${port:solr-host}
-    COLLECTIVE_SOLR_PORT ${port:solr-port}
-    COLLECTIVE_SOLR_BASE ${port:solr-base}
+    COLLECTIVE_SOLR_HOST                     ${port:solr-host}
+    COLLECTIVE_SOLR_PORT                     ${port:solr-port}
+    COLLECTIVE_SOLR_BASE                     ${port:solr-base}
+    COLLECTIVE_SOLR_LOGIN                    ${port:solr-login}
+    COLLECTIVE_SOLR_PASSWORD                 ${port:solr-password}
+    COLLECTIVE_SOLR_HTTPS_CONNECTION         ${port:solr-https-connection}
+    COLLECTIVE_SOLR_IGNORE_CERTIFICATE_CHECK ${port:solr-ignore-certificate-check}
 
 [core-prop]
 recipe = collective.recipe.template
@@ -38,12 +43,12 @@ output = solr/core.properties
 
 [solr]
 recipe = kitconcept.recipe.solr
-src = http://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.tgz
-;src = https://archive.apache.org/dist/solr/solr/9.6.0/solr-9.6.0.tgz
+;src = http://archive.apache.org/dist/lucene/solr/8.11.1/solr-8.11.1.tgz
+src = https://archive.apache.org/dist/solr/solr/9.6.0/solr-9.6.0.tgz
 solr-config = solr
 port = ${port:solr-port}
 
 [sources]
-collective.solr = git ${remotes:collective}/collective.solr.git pushurl=${remotes:collective_push}/collective.solr.git branch=8.x.x-upgrade-4-improvments
-;collective.solr = git ${remotes:imio}/collective.solr.git pushurl=${remotes:imio_push}/collective.solr.git  branch=DMS-954
+;collective.solr = git ${remotes:collective}/collective.solr.git pushurl=${remotes:collective_push}/collective.solr.git branch=8.x.x-upgrade-4-improvments
+collective.solr = git ${remotes:imio}/collective.solr.git pushurl=${remotes:imio_push}/collective.solr.git  branch=DMS-954-rebased
 collective.indexing = git ${remotes:sge}/collective.indexing.git pushurl=${remotes:sge_push}/collective.indexing.git
diff --git a/solr/core.properties.tmpl b/solr/core.properties.tmpl
index 08eded8..6e7c6ae 100644
--- a/solr/core.properties.tmpl
+++ b/solr/core.properties.tmpl
@@ -1,2 +1,2 @@
 name=plone
-dataDir=${buildout:directory}/var/solr/data/
+dataDir=/var/solr/data/
diff --git a/versions-base.cfg b/versions-base.cfg
index d754909..8d40eac 100644
--- a/versions-base.cfg
+++ b/versions-base.cfg
@@ -175,8 +175,10 @@ imio.annex = 2.24
 collective.iconifiedcategory = 0.68
 collective.js.datatables = 4.1.2
 # max version for py2 is 7.x
-# plone.restapi = 7.9.0  not working with collective.solr 7.0, ok with 8.
-plone.restapi = 4.1.4
+# for solr cluster
+plone.restapi = 7.9.0
+# version working with collective.solr 7.0
+# plone.restapi = 4.1.4
 # all under are dependencies of plone.restapi
 attrs = 21.2.0
 configparser = 4.0.2