diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index 879f0d2aa..b123b1f94 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.18-A.4
+        image: alfresco/alfresco-search-services:2.0.18
         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 d91d6fb61..b54767857 100644
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.18-A.4
+SOLR6_TAG=2.0.18
 POSTGRES_TAG=15.4
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8