diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index e8483a696..eeba450f6 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -25,7 +25,7 @@ services:
             - 5432:5432
 
     solr6:
-        image: alfresco/alfresco-search-services:2.0.10
+        image: alfresco/alfresco-search-services:2.0.11-A6
         mem_limit: 2g
         environment:
             #Solr needs to know how to register itself with Alfresco
diff --git a/tests/environment/.env b/tests/environment/.env
index b80f04aaa..012d3b7e6 100644
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,4 +1,4 @@
 TRANSFORMERS_TAG=5.1.2
-SOLR6_TAG=2.0.10
+SOLR6_TAG=2.0.11-A6
 POSTGRES_TAG=13.3
 ACTIVEMQ_TAG=5.16.1