diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
index cf47d559b..50a2154f0 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
@@ -23,7 +23,7 @@ services:
                 -Dsolr.host=<%=searchSolrHost%>
                 -Dsolr.port.ssl=8983
                 -Dsolr.secureComms=<%=secureComms%>
-                -Dsolr.base.url=/solr
+                -Dsolr.baseUrl=/solr
                 -Dindex.subsystem.name=solr6
                 -Dshare.host=localhost
                 -Dalfresco.port=8080
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
index 31859c711..583b40507 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
@@ -22,7 +22,7 @@ services:
                 -Dsolr.host=<%=searchSolrHost%>
                 -Dsolr.port.ssl=8983
                 -Dsolr.secureComms=<%=secureComms%>
-                -Dsolr.base.url=/solr <% if (sharding == 'true') { %>
+                -Dsolr.baseUrl=/solr <% if (sharding == 'true') { %>
                 -Dsolr.useDynamicShardRegistration=true <% } %>
                 -Dindex.subsystem.name=solr6
                 -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml
index 7c137e4a0..c6f466991 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml
@@ -24,7 +24,7 @@ services:
                 -Dsolr.host=<%=searchSolrHost%>
                 -Dsolr.port.ssl=8983
                 -Dsolr.secureComms=<%=secureComms%>
-                -Dsolr.base.url=/solr
+                -Dsolr.baseUrl=/solr
                 -Dindex.subsystem.name=solr6
                 -Dshare.host=localhost
                 -Dalfresco.port=8080
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml
index 6a4f4a7fd..407049ddb 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml
@@ -22,7 +22,7 @@ services:
                 -Dsolr.host=<%=searchSolrHost%>
                 -Dsolr.port.ssl=8983
                 -Dsolr.secureComms=<%=secureComms%>
-                -Dsolr.base.url=/solr <% if (sharding == 'true') { %>
+                -Dsolr.baseUrl=/solr <% if (sharding == 'true') { %>
                 -Dsolr.useDynamicShardRegistration=true <% } %>
                 -Dindex.subsystem.name=solr6