diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 025c546eb..fbf1fda96 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.20
+        image: alfresco/alfresco-search-services:2.0.21-A.2
         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 c9548d5b6..c3aaa09b1 100644
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,4 +1,4 @@
-SOLR6_TAG=2.0.20
+SOLR6_TAG=2.0.21-A.2
 ACTIVEMQ_TAG=6.2.0-jre17-rockylinux8
 ELASTICSEARCH_TAG=8.17.0
 BATCH_INDEXING_TAG=5.7.0-A.3