diff --git a/data/conf/sogo/sogo.conf b/data/conf/sogo/sogo.conf
index 2513f496..1d6a9d3f 100644
--- a/data/conf/sogo/sogo.conf
+++ b/data/conf/sogo/sogo.conf
@@ -77,6 +77,9 @@
     SOGoMaximumFailedLoginInterval = 900;
     SOGoFailedLoginBlockInterval = 900;
 
+    GCSChannelCollectionTimer = 60;
+    GCSChannelExpireAge = 60;
+
     MySQL4Encoding = "utf8mb4";
   //SOGoDebugRequests = YES;
   //SoDebugBaseURL = YES;
diff --git a/docker-compose.yml b/docker-compose.yml
index 07fa1b61..c6c5374f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -523,7 +523,7 @@ services:
             - dockerapi
 
     solr-mailcow:
-      image: mailcow/solr:1.7
+      image: mailcow/solr:1.8
       restart: always
       volumes:
         - solr-vol-1:/opt/solr/server/solr/dovecot-fts/data:Z