diff --git a/14/mariadb-tomcat/xwiki/docker-entrypoint.sh b/14/mariadb-tomcat/xwiki/docker-entrypoint.sh
index 98b7bed1..9ba03634 100755
--- a/14/mariadb-tomcat/xwiki/docker-entrypoint.sh
+++ b/14/mariadb-tomcat/xwiki/docker-entrypoint.sh
@@ -156,7 +156,7 @@ function configure() {
   if [ $INDEX_HOST != 'localhost' ]; then
     echo '  Configuring remote Solr Index'
     xwiki_set_properties 'solr.type' 'remote'
-    xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
+    xwiki_set_properties 'solr.remote.baseUrl' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
   # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
diff --git a/14/mysql-tomcat/xwiki/docker-entrypoint.sh b/14/mysql-tomcat/xwiki/docker-entrypoint.sh
index 98b7bed1..9ba03634 100755
--- a/14/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/14/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -156,7 +156,7 @@ function configure() {
   if [ $INDEX_HOST != 'localhost' ]; then
     echo '  Configuring remote Solr Index'
     xwiki_set_properties 'solr.type' 'remote'
-    xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
+    xwiki_set_properties 'solr.remote.baseUrl' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
   # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
diff --git a/14/postgres-tomcat/xwiki/docker-entrypoint.sh b/14/postgres-tomcat/xwiki/docker-entrypoint.sh
index 98b7bed1..9ba03634 100755
--- a/14/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/14/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -156,7 +156,7 @@ function configure() {
   if [ $INDEX_HOST != 'localhost' ]; then
     echo '  Configuring remote Solr Index'
     xwiki_set_properties 'solr.type' 'remote'
-    xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
+    xwiki_set_properties 'solr.remote.baseUrl' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
   # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
diff --git a/15/mariadb-tomcat/xwiki/docker-entrypoint.sh b/15/mariadb-tomcat/xwiki/docker-entrypoint.sh
index 98b7bed1..9ba03634 100755
--- a/15/mariadb-tomcat/xwiki/docker-entrypoint.sh
+++ b/15/mariadb-tomcat/xwiki/docker-entrypoint.sh
@@ -156,7 +156,7 @@ function configure() {
   if [ $INDEX_HOST != 'localhost' ]; then
     echo '  Configuring remote Solr Index'
     xwiki_set_properties 'solr.type' 'remote'
-    xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
+    xwiki_set_properties 'solr.remote.baseUrl' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
   # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
diff --git a/15/mysql-tomcat/xwiki/docker-entrypoint.sh b/15/mysql-tomcat/xwiki/docker-entrypoint.sh
index 98b7bed1..9ba03634 100755
--- a/15/mysql-tomcat/xwiki/docker-entrypoint.sh
+++ b/15/mysql-tomcat/xwiki/docker-entrypoint.sh
@@ -156,7 +156,7 @@ function configure() {
   if [ $INDEX_HOST != 'localhost' ]; then
     echo '  Configuring remote Solr Index'
     xwiki_set_properties 'solr.type' 'remote'
-    xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
+    xwiki_set_properties 'solr.remote.baseUrl' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
   # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
diff --git a/15/postgres-tomcat/xwiki/docker-entrypoint.sh b/15/postgres-tomcat/xwiki/docker-entrypoint.sh
index 98b7bed1..9ba03634 100755
--- a/15/postgres-tomcat/xwiki/docker-entrypoint.sh
+++ b/15/postgres-tomcat/xwiki/docker-entrypoint.sh
@@ -156,7 +156,7 @@ function configure() {
   if [ $INDEX_HOST != 'localhost' ]; then
     echo '  Configuring remote Solr Index'
     xwiki_set_properties 'solr.type' 'remote'
-    xwiki_set_properties 'solr.remote.url' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
+    xwiki_set_properties 'solr.remote.baseUrl' "http://$INDEX_HOST:$INDEX_PORT/solr/xwiki"
   fi
 
   # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config
diff --git a/template/xwiki/docker-entrypoint.sh b/template/xwiki/docker-entrypoint.sh
index cdfdbaca..6a81942b 100755
--- a/template/xwiki/docker-entrypoint.sh
+++ b/template/xwiki/docker-entrypoint.sh
@@ -145,7 +145,7 @@ function configure() {
   if [ \$INDEX_HOST != 'localhost' ]; then
     echo '  Configuring remote Solr Index'
     xwiki_set_properties 'solr.type' 'remote'
-    xwiki_set_properties 'solr.remote.url' "http://\$INDEX_HOST:\$INDEX_PORT/solr/xwiki"
+    xwiki_set_properties 'solr.remote.baseUrl' "http://\$INDEX_HOST:\$INDEX_PORT/solr/xwiki"
   fi
 
   # If the files already exist then copy them to the XWiki's WEB-INF directory. Otherwise copy the default config