diff --git a/docker-compose.yml b/docker-compose.yml
index 491a8107..9846be1b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -416,7 +416,7 @@ services:
       volumes:
         - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data
       ports:
-        - "${SOLR_PORT:-127.0.0.1:8983}:8983"
+        - "${SOLR_PORT:-127.0.0.1:18983}:8983"
       environment:
         - TZ=${TZ}
         - SOLR_HEAP=${SOLR_HEAP:-1024}
diff --git a/generate_config.sh b/generate_config.sh
index d8a28ebd..93298d79 100755
--- a/generate_config.sh
+++ b/generate_config.sh
@@ -148,7 +148,7 @@ POPS_PORT=995
 SIEVE_PORT=4190
 DOVEADM_PORT=127.0.0.1:19991
 SQL_PORT=127.0.0.1:13306
-SOLR_PORT=127.0.0.1:8983
+SOLR_PORT=127.0.0.1:18983
 
 # Your timezone