diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php
index 76ab0fdb..50de93b0 100644
--- a/data/web/inc/vars.inc.php
+++ b/data/web/inc/vars.inc.php
@@ -1,6 +1,6 @@
 <?php
 error_reporting(E_ERROR);
-//error_reporting(E_ALL);
+error_reporting(E_ALL);
 
 /*
 PLEASE USE THE FILE "vars.local.inc.php" TO OVERWRITE SETTINGS AND MAKE THEM PERSISTENT!
@@ -28,7 +28,6 @@ if ($https_port === FALSE) {
   $https_port = substr($_SERVER['HTTP_HOST'], $https_port+1);
 }
 
-// TODO: Switch from array_pop to array_key_last with release of PHP 7.3
 // Alternatively select port here =>
 //$https_port = 1234;
 // Other settings =>
@@ -44,18 +43,18 @@ $autodiscover_config = array(
   // The autoconfig service will additionally announce the STARTTLS-enabled ports, specified in the "tlsport" variable.
   'imap' => array(
     'server' => $mailcow_hostname,
-    'port' => array_key_last(explode(':', getenv('IMAPS_PORT'))),
-    'tlsport' => array_key_last(explode(':', getenv('IMAP_PORT'))),
+    'port' => end(explode(':', getenv('IMAPS_PORT'))),
+    'tlsport' => end(explode(':', getenv('IMAP_PORT'))),
   ),
   'pop3' => array(
     'server' => $mailcow_hostname,
-    'port' => array_key_last(explode(':', getenv('POPS_PORT'))),
-    'tlsport' => array_key_last(explode(':', getenv('POP_PORT'))),
+    'port' => end(explode(':', getenv('POPS_PORT'))),
+    'tlsport' => end(explode(':', getenv('POP_PORT'))),
   ),
   'smtp' => array(
     'server' => $mailcow_hostname,
-    'port' => array_key_last(explode(':', getenv('SMTPS_PORT'))),
-    'tlsport' => array_key_last(explode(':', getenv('SUBMISSION_PORT'))),
+    'port' => end(explode(':', getenv('SMTPS_PORT'))),
+    'tlsport' => end(explode(':', getenv('SUBMISSION_PORT'))),
   ),
   'activesync' => array(
     'url' => 'https://'.$mailcow_hostname.($https_port == 443 ? '' : ':'.$https_port).'/Microsoft-Server-ActiveSync',
diff --git a/docker-compose.yml b/docker-compose.yml
index 3dec0fa7..81873e28 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2.1'
 services:
 
     unbound-mailcow:
-      image: mailcow/unbound:1.5
+      image: mailcow/unbound:1.6
       build: ./data/Dockerfiles/unbound
       command: /usr/sbin/unbound
       environment:
@@ -395,7 +395,7 @@ services:
             - dockerapi
 
     solr-mailcow:
-      image: mailcow/solr:1.0
+      image: mailcow/solr:1.1
       build: ./data/Dockerfiles/solr
       restart: always
       volumes: