diff --git a/ci/testctl b/ci/testctl
index e7626822..75bd2ca5 100755
--- a/ci/testctl
+++ b/ci/testctl
@@ -1,469 +1,473 @@
 #!/bin/bash
 
 base_dir="$(dirname $(realpath "$0"))"
 pushd "${base_dir}"
 pushd ..
 
 set -e
 set -x
 
 PASSPORT_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----
 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
 bakhie7hJBP7BoOup+dD5NQPlXBQ434=
 -----END PRIVATE KEY-----"
 PASSPORT_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----
 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApmHkae115z3vMF9IjiUa
 XrJH1Ljifxqs+XbDCFhQenz2iOf/bZDBMqfrwhBe3hVywa13kIuhf1TZlcJ/nRhE
 IZIbg6BF6/GeHN998Cx/IjhBeFkG7f1hdxEXY5ibd7yq8vAfzizZpnCu4+LM/NvI
 ei9mU+hj3GxrDbpMQTHCDDqX5aNEix8uFU4XaOm9UOJw9ivz19cqcnxWqJ49znxw
 XUlS5k4Hewbwf2s2BWFhz+CDWPHMpWViLQ17qj5QRklNn39sUymP1kXKP3Y76zvW
 zNVniPvFt+hHixxEa7tUEaTdtk4FgkNnWy0bFa7DIPC8ukjHvHHg10LeQiygDduI
 xbdVJwYK/qitU68ZAbbufldlj2FoVLwSyP9qpxUIdRoljCop1kDu6xQiAq0VHEAV
 LtgMpZhtD/6D4z644QJ8atx4Ljp/HEtTngaTh+/vLc9AnhHclX0/JmlbP1VkWWxG
 9FIxS0TVPolRBs8948kLioTif9lrltJicxd6T0OuA5fny8l6hdSlzaD3pnr5pkYw
 mVn5FgBAFnd/skX6DsRs+eb2lNahkvNZZ15z9UeU2Rl6J9uBx0vbkcB7eiSCPhRM
 IKq/CtkyEgz8ce4kG18fJHDFDASRvGjaBu91lV5h7NLmhFLFzMvb7XoHrv/yD6TV
 E5W47J/DrfrevJkzS1GV++MCAwEAAQ==
 -----END PUBLIC KEY-----"
 KOLAB_GIT_REF=dev/mollekopf
 KOLAB_GIT_REMOTE=https://git.kolab.org/source/kolab
 GIT_REF_ROUNDCUBEMAIL=dev/kolab-1.5
 GIT_REMOTE_ROUNDCUBEMAIL=https://git.kolab.org/source/roundcubemail.git
 GIT_REF_ROUNDCUBEMAIL_PLUGINS=master
 GIT_REMOTE_ROUNDCUBEMAIL_PLUGINS=https://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git
 GIT_REF_CHWALA=dev/mollekopf
 GIT_REMOTE_CHWALA=https://git.kolab.org/diffusion/C/chwala.git
 GIT_REF_SYNCROTON=master
 GIT_REMOTE_SYNCROTON=https://git.kolab.org/diffusion/S/syncroton.git
 GIT_REF_AUTOCONF=master
 GIT_REMOTE_AUTOCONF=https://git.kolab.org/diffusion/AC/autoconf.git
 GIT_REF_IRONY=master
 GIT_REMOTE_IRONY=https://git.kolab.org/source/iRony.git
 GIT_REF_FREEBUSY=master
 GIT_REMOTE_FREEBUSY=https://git.kolab.org/diffusion/F/freebusy.git
 IMAP_GIT_REF=dev/mollekopf
 IMAP_GIT_REMOTE=https://git.kolab.org/source/cyrus-imapd
 
 PODMAN="podman"
 
 # Teardown the currently running environment
 kolab__teardown() {
     $PODMAN pod rm --force tests
     $PODMAN pod rm --force dev
 }
 
 # Build all containers required for testing
 kolab__build() {
     $PODMAN build docker/base/ -f almalinux9 -t apheleia/almalinux9
     $PODMAN build docker/swoole/ -t apheleia/swoole
 
     $PODMAN build --ulimit nofile=65535:65535 docker/webapp -t kolab-webapp
     $PODMAN build docker/imap -t kolab-imap
     $PODMAN build docker/mariadb -t mariadb
     $PODMAN build docker/redis -t redis
     $PODMAN build docker/proxy -t proxy
 
     $PODMAN build --ulimit nofile=65535:65535 docker/tests -t kolab-tests
     $PODMAN build --ulimit nofile=65535:65535 docker/roundcube -t roundcube
 }
 
 # Setup the test environment
 kolab__setup() {
     kolab__teardown
     echo "Build"
     kolab__build
     echo "Setup"
 
     POD=tests
 
     # Create the pod first
     $PODMAN pod create --name $POD
 
     podman__run_mariadb
     podman__run_redis
 
     podman__healthcheck mariadb redis
 
     podman__run_webapp config.demo
     podman__healthcheck webapp
 
     podman__run_imap
     podman__healthcheck imap
 
     # Ensure all commands are processed
     echo "Flushing work queue"
     $PODMAN exec -ti webapp ./artisan queue:work --stop-when-empty
 
     podman__run_minio
     podman__healthcheck minio
 
     # Validate the test environment 
     kolab__validate
 }
 
 
 # "testsuite"
 # "quicktest"
 # "tests/Feature/Jobs/WalletCheckTest.php"
 kolab__test() {
     $PODMAN run -ti --pod tests --name kolab-tests --replace \
         --env-file=ci/env \
         -v ./src:/src/kolabsrc.orig:ro \
         -e APP_SERVICES_DOMAINS="localhost" \
         -e PASSPORT_PRIVATE_KEY="$PASSPORT_PRIVATE_KEY" \
         -e PASSPORT_PUBLIC_KEY="$PASSPORT_PUBLIC_KEY" \
         kolab-tests:latest /init.sh $@
 }
 
 kolab__proxytest() {
     $PODMAN run -ti --pod tests --name proxy-tests --replace \
         -v ./docker/certs/:/etc/certs/:ro \
         --env-file=ci/env \
         -e SSL_CERTIFICATE=/etc/certs/imap.hosted.com.cert \
         -e SSL_CERTIFICATE_KEY=/etc/certs/imap.hosted.com.key \
         proxy:latest /init.sh validate
 }
 
 kolab__lint() {
     kolab__test lint
 }
 
 # Setup the test environment and run a complete testsuite
 kolab__testrun() {
     echo "Setup"
     kolab__setup
     echo "Test"
     kolab__test testsuite
 }
 
 # Setup the test environment and run all testsuites
 kolab__testrun_complete() {
     echo "Setup"
     kolab__setup
     echo "Test"
     kolab__test lint
     kolab__test testsuite
     kolab__rctest syncroton lint
     kolab__rctest syncroton testsuite
     kolab__rctest irony lint
     # kolab__rctest irony testsuite
     kolab__rctest roundcubemail-plugins-kolab lint
     # kolab__rctest roundcubemail-plugins-kolab testsuite
 }
 
 
 # Get a shell inside the test container to run/debug tests
 kolab__shell() {
     kolab__test shell
 }
 
 # Run the roundcube testsuite
 kolab__rctest() {
     $PODMAN run -t --pod tests --name roundcube --replace \
         -v ./ext:/src.orig:ro \
         -e APP_DOMAIN=kolab.test \
         -e DES_KEY=kBxUM/53N9p9abusAoT0ZEAxwI2pxFz/ \
         -e DB_HOST=127.0.0.1 \
         -e DB_RC_DATABASE=roundcube \
         -e DB_RC_USERNAME=roundcube \
         -e DB_RC_PASSWORD=simple123 \
         -e IMAP_HOST=localhost \
         -e IMAP_PORT=11143 \
         -e IMAP_ADMIN_LOGIN=cyrus-admin \
         -e IMAP_ADMIN_PASSWORD=simple123 \
+        -e IMAP_DEBUG=false \
+        -e SQL_DEBUG=false \
+        -e ACTIVESYNC_DEBUG=false \
+        -e RUN_MIGRATIONS=true \
         -e MAIL_HOST=localhost \
         -e MAIL_PORT=10587 \
         -e FILEAPI_WOPI_OFFICE=https://kolab.local \
         -e CALENDAR_CALDAV_SERVER=http://imap:11080/dav \
         -e KOLAB_ADDRESSBOOK_CARDDAV_SERVER=http://imap:11080/dav \
         roundcube:latest ./init.sh $@
 }
 
 # Get a shell inside the roundcube test container to run/debug tests
 kolab__rcshell() {
     $PODMAN run -ti --pod tests --name roundcube --replace \
         -v ./ext:/src.orig:ro \
         -e APP_DOMAIN=kolab.test \
         -e DES_KEY=kBxUM/53N9p9abusAoT0ZEAxwI2pxFz/ \
         -e DB_HOST=127.0.0.1 \
         -e DB_RC_DATABASE=roundcube \
         -e DB_RC_USERNAME=roundcube \
         -e DB_RC_PASSWORD=simple123 \
         -e IMAP_HOST=localhost \
         -e IMAP_PORT=11143 \
         -e IMAP_ADMIN_LOGIN=cyrus-admin \
         -e IMAP_ADMIN_PASSWORD=simple123 \
         -e MAIL_HOST=localhost \
         -e MAIL_PORT=10587 \
         -e FILEAPI_WOPI_OFFICE=https://kolab.local \
         -e CALENDAR_CALDAV_SERVER=http://localhost:11080/dav \
         -e KOLAB_ADDRESSBOOK_CARDDAV_SERVER=http://localhost:11080/dav \
         roundcube:latest ./init.sh shell
 }
 
 kolab__validate() {
     $PODMAN exec imap testsaslauthd -u cyrus-admin -p simple123
     $PODMAN exec imap testsaslauthd -u "john@kolab.org" -p simple123
     # Ensure the inbox is created
     FOUND=false
     for i in {1..60}; do
         if $PODMAN exec imap bash -c 'echo "lm" | cyradm --auth PLAIN -u cyrus-admin -w simple123 --port 11143 localhost | grep "user/john@kolab.org"'; then
             echo "Found mailbox";
             FOUND=true
             break
         else
             echo "Waiting for mailbox";
             sleep 1;
         fi
     done
     if ! $FOUND; then
         echo "Failed to find the inbox for john@kolab.org"
         exit 1
     fi
 }
 
 podman__healthcheck() {
     for CONTAINER in $@; do
         echo "Waiting for ${CONTAINER} become healthy "
         while [ $(podman healthcheck run ${CONTAINER}) ]; do
             echo -n "."; sleep 5;
         done
     done
 }
 
 podman__run_proxy() {
     $PODMAN run -dt --pod $POD --name proxy --replace \
         -v ./docker/certs:/etc/certs:ro \
         -e APP_WEBSITE_DOMAIN="kolab.local" \
         -e SSL_CERTIFICATE="/etc/certs/imap.hosted.com.cert" \
         -e SSL_CERTIFICATE_KEY="/etc/certs/imap.hosted.com.key" \
         -e WEBAPP_BACKEND="http://localhost:8000" \
         -e MEET_BACKEND="https://localhost:12443" \
         -e ROUNDCUBE_BACKEND="http://localhost:8080" \
         -e DAV_BACKEND="http://localhost:11080/dav" \
         -e COLLABORA_BACKEND="http://localhost:9980" \
         kolab-proxy:latest
 }
 
 podman__run_roundcube() {
     $PODMAN run -dt --pod $POD --name roundcube --replace \
         -v ./ext:/src.orig:ro \
         -e APP_DOMAIN=kolab.test \
         -e DES_KEY=kBxUM/53N9p9abusAoT0ZEAxwI2pxFz/ \
         -e DB_HOST=127.0.0.1 \
         -e DB_RC_DATABASE=roundcube \
         -e DB_RC_USERNAME=roundcube \
         -e DB_RC_PASSWORD=simple123 \
         -e IMAP_HOST=localhost \
         -e IMAP_PORT=11143 \
         -e IMAP_ADMIN_LOGIN=cyrus-admin \
         -e IMAP_ADMIN_PASSWORD=simple123 \
         -e MAIL_HOST=localhost \
         -e MAIL_PORT=10587 \
         -e IMAP_DEBUG=true \
         -e FILEAPI_WOPI_OFFICE=https://kolab.local \
         -e CALENDAR_CALDAV_SERVER=http://imap:11080/dav \
         -e KOLAB_ADDRESSBOOK_CARDDAV_SERVER=http://imap:11080/dav \
         roundcube:latest
 }
 
 podman__run_mariadb() {
     $PODMAN run -dt --pod $POD --name mariadb --replace \
         --mount=type=tmpfs,tmpfs-size=512M,destination=/var/lib/mysql,U=true \
         -e MYSQL_ROOT_PASSWORD=simple123 \
         -e TZ="+02:00" \
         -e DB_HKCCP_DATABASE=kolabdev \
         -e DB_HKCCP_USERNAME=kolabdev \
         -e DB_HKCCP_PASSWORD=simple123 \
         -e DB_KOLAB_DATABASE=kolab \
         -e DB_KOLAB_USERNAME=kolab \
         -e DB_KOLAB_PASSWORD=simple123 \
         -e DB_RC_DATABASE=roundcube \
         -e DB_RC_USERNAME=roundcube \
         -e DB_RC_PASSWORD=simple123 \
         --health-cmd "mysqladmin -u root ping && test -e /tmp/initialized" \
         mariadb:latest
 }
 
 podman__run_redis() {
     $PODMAN run -dt --pod $POD --name redis --replace \
         --mount=type=tmpfs,tmpfs-size=128M,destination=/var/lib/redis,U=true \
         --health-cmd "redis-cli ping || exit 1" \
         redis:latest
 }
 
 podman__run_minio() {
     $PODMAN run -dt --pod $POD --name minio --replace \
         --mount=type=tmpfs,tmpfs-size=128M,destination=/data,U=true \
         -e MINIO_ROOT_USER=minio \
         -e MINIO_ROOT_PASSWORD=simple123 \
         --health-cmd "mc ready local || exit 1" \
         --entrypoint sh \
         quay.io/minio/minio:latest -c 'mkdir -p /data/kolab && minio server /data --console-address ":9001"'
 }
 
 podman__run_webapp() {
     # We run with a fixed config.demo overlay and override the environment with ci/env
     $PODMAN run -dt --pod $POD --name webapp --replace \
         --env-file=ci/env \
         -v ./src:/src/kolabsrc.orig:ro \
         -v ./$1/src:/src/overlay:ro \
         -e NOENVFILE=true \
         -e APP_SERVICES_ALLOWED_DOMAINS="webapp,localhost,services.kolab.local" \
         -e PASSPORT_PRIVATE_KEY="$PASSPORT_PRIVATE_KEY" \
         -e PASSPORT_PUBLIC_KEY="$PASSPORT_PUBLIC_KEY" \
         --health-cmd "./artisan octane:status || exit 1" \
         kolab-webapp:latest
 }
 
 podman__run_imap() {
     $PODMAN run -dt --pod $POD --name imap --replace \
         --mount=type=tmpfs,tmpfs-size=128M,tmpfs-mode=777,destination=/var/spool/imap,U=true,notmpcopyup \
         --mount=type=tmpfs,tmpfs-size=128M,tmpfs-mode=777,destination=/var/lib/imap,U=true,notmpcopyup \
         -e APP_SERVICES_DOMAIN="localhost" \
         -e SERVICES_PORT=8000 \
         -e IMAP_ADMIN_LOGIN=cyrus-admin \
         -e IMAP_ADMIN_PASSWORD=simple123 \
         --health-cmd "test -e /run/saslauthd/mux && kill -0 \$(cat /var/run/master.pid)" \
         kolab-imap:latest
 }
 
 podman__run_meet() {
     $PODMAN run -dt --pod $POD --name meet --replace \
         -v ./meet/server:/src/meet:ro \
         -v ./docker/certs/meet.kolab.local.cert:/etc/pki/tls/certs/meet.kolab.local.cert \
         -v ./docker/certs/meet.kolab.local.key:/etc/pki/tls/private/meet.kolab.local.key \
         -e WEBRTC_LISTEN_IP=127.0.0.1 \
         -e WEBRTC_ANNOUNCED_ADDRESS=127.0.0.1 \
         -e PUBLIC_DOMAIN=kolab.local \
         -e LISTENING_HOST=127.0.0.1 \
         -e LISTENING_PORT=12443 \
         -e DEBUG="*" \
         -e TURN_SERVER=none \
         -e AUTH_TOKEN=simple123 \
         -e WEBHOOK_TOKEN=simple123 \
         -e WEBHOOK_URL=kolab.local/api/webhooks/meet \
         -e SSL_CERT=/etc/pki/tls/certs/meet.kolab.local.cert \
         -e SSL_KEY=/etc/pki/tls/private/meet.kolab.local.key \
         kolab-meet:latest
 }
 
 kolab__deploy() {
     POD=dev
     # Create the pod first
     $PODMAN pod create \
         --replace \
         --add-host=kolab.local:127.0.0.1 \
         --publish "443:6443" \
         --publish "465:6465" \
         --publish "587:6587" \
         --publish "143:6143" \
         --publish "993:6993" \
         --publish "44444:44444/udp" \
         --publish "44444:44444/tcp" \
         --name $POD
 
     podman__run_mariadb
     podman__run_redis
 
     podman__healthcheck mariadb redis
 
     podman__run_webapp config.prod
     podman__healthcheck webapp
 
     podman__run_imap
     podman__healthcheck imap
 
     # Ensure all commands are processed
     echo "Flushing work queue"
     $PODMAN exec -ti webapp ./artisan queue:work --stop-when-empty
 
     $PODMAN exec webapp ./artisan user:password "admin@kolab.local" "simple123"
 
     podman__run_minio
     podman__healthcheck minio
 
     podman__run_meet
     podman__healthcheck meet
 
     podman__run_roundcube
     podman__run_proxy
 }
 
 kolab__help() {
     cat <<EOF
   This is the kolab test execution utility.
   This script manages building the containers, setting up a test environment, and executing the tests in that environment, using podman.
 
   To run the kolab 4 testsuite:
     testctl testrun
 
   The following commands are available:
     setup: Build containers and setup the test pod
     test: Run tests (pass testsuite/quicktest or a path to a test starting with tests/ as argument)
     rctest: Run tests roundcube testsuite (WIP)
     shell: Get a shell in the test container
     testrun: Setup & test in one command, suitable as one shot command to run the main tests.
     deploy: Setup a test environment
 EOF
 }
 
 cmdname=$1
 shift
 # make sure we actually *did* get passed a valid function name
 if declare -f "kolab__$cmdname" >/dev/null 2>&1; then
     "kolab__$cmdname" "${@:1}"
 else
     echo "Function $cmdname not recognized" >&2
     kolab__help
     exit 1
 fi
 
diff --git a/docker/roundcube/Dockerfile b/docker/roundcube/Dockerfile
index 797bf152..26e80451 100644
--- a/docker/roundcube/Dockerfile
+++ b/docker/roundcube/Dockerfile
@@ -1,90 +1,92 @@
 FROM apheleia/almalinux9
 
 ENV HOME=/opt/app-root/src
 
 # Add kolab
 RUN rpm --import https://mirror.apheleia-it.ch/repos/Kolab:/16/key.asc && \
     rpm -Uvh https://mirror.apheleia-it.ch/repos/Kolab:/16/kolab-16-for-el9.rpm
 
 # Install php modules
 RUN sed -i -e '/^ssl/d' /etc/yum.repos.d/kolab*.repo && \
     dnf config-manager --enable kolab-16 &&\
     dnf -y --setopt=install_weak_deps=False --setopt tsflags= install php-kolab php-kolabformat \
         composer \
         diffutils \
         file \
         git \
         make \
         unzip \
         curl-minimal \
         mariadb \
         which \
         rsync \
         openssl-devel \
         httpd \
         patch \
         php-cli \
         php-common \
         php-devel \
         php-ldap \
         php-opcache \
         php-pecl-apcu \
         php-mysqlnd \
         php-gd \
         php-fpm \
         php-pear \
         ImageMagick \
         re2c \
         npm \
         wget && \
     dnf clean all
 
 RUN npm install -g less less-plugin-clean-css
 
 WORKDIR ${HOME}
 
 COPY rootfs/opt/app-root/src/build.sh /opt/app-root/src/
 COPY rootfs/opt/app-root/src/update.sh /opt/app-root/src/
 COPY rootfs/opt/app-root/src/composer.json /opt/app-root/src/
 COPY rootfs/opt/app-root/src/roundcubemail-config-templates /opt/app-root/src/roundcubemail-config-templates
 
 ARG GIT_REF_ROUNDCUBEMAIL=dev/kolab-1.5
 ARG GIT_REMOTE_ROUNDCUBEMAIL=https://git.kolab.org/source/roundcubemail.git
 ARG GIT_REF_ROUNDCUBEMAIL_PLUGINS=master
 ARG GIT_REMOTE_ROUNDCUBEMAIL_PLUGINS=https://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git
 ARG GIT_REF_CHWALA=master
 ARG GIT_REMOTE_CHWALA=https://git.kolab.org/diffusion/C/chwala.git
 ARG GIT_REF_SYNCROTON=master
 ARG GIT_REMOTE_SYNCROTON=https://git.kolab.org/diffusion/S/syncroton.git
 ARG GIT_REF_AUTOCONF=master
 ARG GIT_REMOTE_AUTOCONF=https://git.kolab.org/diffusion/AC/autoconf.git
 ARG GIT_REF_IRONY=master
 ARG GIT_REMOTE_IRONY=https://git.kolab.org/source/iRony.git
 ARG GIT_REF_FREEBUSY=master
 ARG GIT_REMOTE_FREEBUSY=https://git.kolab.org/diffusion/F/freebusy.git
 
 RUN /opt/app-root/src/build.sh && \
     chgrp -R 0 /opt/app-root/src && \
     chmod -R g=u /opt/app-root/src && \
     mkdir -p /run/php-fpm && \
     chmod 777 /run/php-fpm && \
     mkdir -p /run/httpd && \
     chmod 777 /run/httpd && \
     mkdir -p /data && \
     chmod 777 /data && \
     chmod -R 777 /etc/php.ini /etc/httpd /var/log/httpd /var/lib/httpd /data && \
     chown -R 1001:0 /opt/app-root/src /data
 
 COPY /rootfs /
 RUN chmod -R 777 /etc/php.ini /etc/httpd
 
 VOLUME /data
 
+ENV RUN_MIGRATIONS=true
+
 USER 1001
 
 EXPOSE 8080
 
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
 
 CMD [ "/opt/app-root/src/init.sh" ]
diff --git a/docker/roundcube/rootfs/opt/app-root/src/init.sh b/docker/roundcube/rootfs/opt/app-root/src/init.sh
index fa149ca8..1d6c5287 100755
--- a/docker/roundcube/rootfs/opt/app-root/src/init.sh
+++ b/docker/roundcube/rootfs/opt/app-root/src/init.sh
@@ -1,207 +1,208 @@
 #!/bin/bash
 
 echo "Starting"
 set -e
 set -x
 
 mkdir -p /data/pgp-home
 chmod 777 /data/pgp-home
 
 pushd /opt/app-root/src/
-pushd roundcubemail
 
 ## Copy our configs over the default ones
-cp /opt/app-root/src/roundcubemail-config-templates/* config/
+cp /opt/app-root/src/roundcubemail-config-templates/* roundcubemail/config/
 
-# Initialize the db
-if [[ "$DB_ROOT_PASSWORD" == "" ]]; then
-    echo "Not using password"
-    cat > /tmp/kolab-setup-my.cnf << EOF
+if [[ "$RUN_MIGRATIONS" == "true" ]]; then
+    # Initialize the db
+    if [[ "$DB_ROOT_PASSWORD" == "" ]]; then
+        echo "Not using password"
+        cat > /tmp/kolab-setup-my.cnf << EOF
 [client]
 host=${DB_HOST}
 user=root
 EOF
-else
-    cat > /tmp/kolab-setup-my.cnf << EOF
+    else
+        cat > /tmp/kolab-setup-my.cnf << EOF
 [client]
 host=${DB_HOST}
 user=root
 password=${DB_ROOT_PASSWORD}
 EOF
-fi
+    fi
 
-mysql --defaults-file=/tmp/kolab-setup-my.cnf <<EOF
+    mysql --defaults-file=/tmp/kolab-setup-my.cnf <<EOF
 CREATE DATABASE IF NOT EXISTS $DB_RC_DATABASE CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 CREATE USER IF NOT EXISTS $DB_RC_USERNAME@'%' IDENTIFIED BY '$DB_RC_PASSWORD';
 CREATE USER IF NOT EXISTS $DB_RC_USERNAME@'127.0.0.1' IDENTIFIED BY '$DB_RC_PASSWORD';
 ALTER USER $DB_RC_USERNAME@'%' IDENTIFIED BY '$DB_RC_PASSWORD';
 ALTER USER $DB_RC_USERNAME@'127.0.0.1' IDENTIFIED BY '$DB_RC_PASSWORD';
 GRANT ALL PRIVILEGES ON $DB_RC_DATABASE.* TO $DB_RC_USERNAME@'%';
 FLUSH PRIVILEGES;
 EOF
 
-# Run roundcube and plugin database initializations
-echo "Initializing tables..."
-bin/initdb.sh --dir SQL/ || :
-
-for plugin in $(find plugins -mindepth 1 -maxdepth 1 -type d | sort); do
-    if [ ! -z "$(find ${plugin} -type d -name SQL)" ]; then
-        for dir in $(find plugins/$(basename ${plugin})/ -type d -name SQL); do
-            # Skip plugins with multiple drivers and no kolab driver
-            if [ ! -z "$(echo $dir | grep driver)" ]; then
-                if [ -z "$(echo $dir | grep kolab)" ]; then
-                    continue
+    pushd roundcubemail
+    # Run roundcube and plugin database initializations
+    echo "Initializing tables..."
+    bin/initdb.sh --dir SQL/ || :
+
+    for plugin in $(find plugins -mindepth 1 -maxdepth 1 -type d | sort); do
+        if [ ! -z "$(find ${plugin} -type d -name SQL)" ]; then
+            for dir in $(find plugins/$(basename ${plugin})/ -type d -name SQL); do
+                # Skip plugins with multiple drivers and no kolab driver
+                if [ ! -z "$(echo $dir | grep driver)" ]; then
+                    if [ -z "$(echo $dir | grep kolab)" ]; then
+                        continue
+                    fi
                 fi
-            fi
 
-            bin/initdb.sh \
-                --dir $dir \
-                --package $(basename ${plugin}) \
-                >/dev/null 2>&1 || :
-        done
-    fi
-done
-
-popd
-
-roundcubemail/bin/initdb.sh --dir syncroton/docs/SQL/ || :
-roundcubemail/bin/initdb.sh --dir chwala/doc/SQL/ || :
-
-echo "Updating tables..."
-roundcubemail/bin/updatedb.sh --dir syncroton/docs/SQL/ --package syncroton || :
-roundcubemail/bin/updatedb.sh --dir roundcubemail/SQL/ --package roundcube || :
-roundcubemail/bin/updatedb.sh --dir roundcubemail/plugins/libkolab/SQL/ --package libkolab || :
-roundcubemail/bin/updatedb.sh --dir roundcubemail/plugins/kolab-calendar/SQL/ --package calendar-kolab || :
+                bin/initdb.sh \
+                    --dir $dir \
+                    --package $(basename ${plugin}) \
+                    >/dev/null 2>&1 || :
+            done
+        fi
+    done
+
+    popd
+    roundcubemail/bin/initdb.sh --dir syncroton/docs/SQL/ || :
+    roundcubemail/bin/initdb.sh --dir chwala/doc/SQL/ || :
+
+    echo "Updating tables..."
+    roundcubemail/bin/updatedb.sh --dir syncroton/docs/SQL/ --package syncroton || :
+    roundcubemail/bin/updatedb.sh --dir roundcubemail/SQL/ --package roundcube || :
+    roundcubemail/bin/updatedb.sh --dir roundcubemail/plugins/libkolab/SQL/ --package libkolab || :
+    roundcubemail/bin/updatedb.sh --dir roundcubemail/plugins/kolab-calendar/SQL/ --package calendar-kolab || :
+fi
 
 echo ""
 echo "Done, starting httpd..."
 
 if [ "$1" == "syncroton" ]; then
     ./update-from-source.sh || :
 
     sed -i "s/?>/\$config['activesync_test_username'] = 'john@kolab.org';\n?>/" roundcubemail/config/config.inc.php
     sed -i "s/?>/\$config['activesync_test_password'] = 'simple123';\n?>/" roundcubemail/config/config.inc.php
     sed -i "s/?>/\$config['activesync_test_host'] = 'http:\/\/localhost:8001';\n?>/" roundcubemail/config/config.inc.php
     sed -i -r -e "s/config\['activesync_init_subscriptions'\] =.*$/config['activesync_init_subscriptions'] = 0;/g" roundcubemail/config/kolab_syncroton.inc.php
     sed -i -r -e "s/config\['activesync_multifolder_blacklist_event'\] =.*$/config['activesync_multifolder_blacklist_event'] = array('windowsoutlook');/g" roundcubemail/config/kolab_syncroton.inc.php
     sed -i -r -e "s/config\['activesync_multifolder_blacklist_task'\] =.*$/config['activesync_multifolder_blacklist_task'] = array('windowsoutlook');/g" roundcubemail/config/kolab_syncroton.inc.php
     sed -i -r -e "s/config\['activesync_multifolder_blacklist_contact'\] =.*$/config['activesync_multifolder_blacklist_contact'] = array('windowsoutlook');/g" roundcubemail/config/kolab_syncroton.inc.php
 
     pushd syncroton
     php -S localhost:8001 &
     pushd tests
 
     if [ "$2" == "testsuite" ]; then
         php \
             -dmemory_limit=-1 \
             ../vendor/bin/phpunit \
             --verbose \
             --testsuite Unit
         php \
             -dmemory_limit=-1 \
             ../vendor/bin/phpunit \
             --verbose \
             --testsuite Sync
     elif [ "$2" == "quicktest" ]; then
         php \
             -dmemory_limit=-1 \
             ../vendor/bin/phpunit \
             --verbose \
             --testsuite Unit
     elif [ "$2" == "lint" ]; then
         popd
         cp ../syncroton.phpstan.neon phpstan.neon
         php -dmemory_limit=-1 vendor/bin/phpstan
     elif [ "$2" == "shell" ]; then
         exec /bin/bash
     else
         php \
             -dmemory_limit=-1 \
             ../vendor/bin/phpunit \
             --verbose \
             --stop-on-defect \
             --stop-on-error \
             --stop-on-failure \
             "$2"
     fi
 elif [ "$1" == "irony" ]; then
     ./update-from-source.sh || :
 
     pushd iRony
     pushd test
 
     if [ "$2" == "testsuite" ]; then
         php \
             -dmemory_limit=-1 \
             ../vendor/bin/phpunit \
             --verbose
     elif [ "$2" == "shell" ]; then
         exec /bin/bash
     else
         php \
             -dmemory_limit=-1 \
             ../vendor/bin/phpunit \
             --verbose \
             --stop-on-defect \
             --stop-on-error \
             --stop-on-failure \
             "$2"
     fi
 elif [ "$1" == "roundcubemail-plugins-kolab" ]; then
     ./update-from-source.sh || :
     # We run the tests from the plugins directory, which we don't normally update
     if [ -d /src.orig/roundcubemail-plugins-kolab ]; then
         rsync -av \
             --no-links \
             --exclude=vendor \
             --exclude=temp \
             --exclude=config \
             --exclude=logs \
             --exclude=.git \
             --exclude=config.inc.php \
             --exclude=composer.json \
             --exclude=composer.lock \
             /src.orig/roundcubemail-plugins-kolab/ /opt/app-root/src/roundcubemail-plugins-kolab
     fi
 
     pushd roundcubemail-plugins-kolab
     ln -s ../roundcubemail/tests tests
     ln -s ../roundcubemail/program program
 
     if [ "$2" == "testsuite" ]; then
         #FIXME this doesn't currently work:
         #* set logging to stdout
         #* add test configuration
         #* there's some error about serializing a libcalendaring object to a string?
         php \
             -dmemory_limit=-1 \
             ../roundcubemail/vendor/bin/phpunit \
             --verbose
     elif [ "$2" == "lint" ]; then
         cp ../roundcubemail-plugins-kolab.phpstan.neon phpstan.neon
         php -dmemory_limit=-1 ../roundcubemail/vendor/bin/phpstan
         php ../roundcubemail/vendor/bin/php-cs-fixer fix --dry-run --using-cache=no --diff --verbose
     elif [ "$2" == "shell" ]; then
         exec /bin/bash
     else
         php \
             -dmemory_limit=-1 \
             ../roundcubemail/vendor/bin/phpunit \
             --verbose \
             --stop-on-defect \
             --stop-on-error \
             --stop-on-failure \
             "$2"
     fi
 elif [ "$1" == "phpstan" ]; then
     ./update-from-source.sh || :
     pushd roundcubemail
     cp /src.orig/roundcubemail-plugins-kolab/phpstan.neon .
     cp /src.orig/roundcubemail-plugins-kolab/phpstan.bootstrap.php .
     php -dmemory_limit=-1 vendor/bin/phpstan analyse
 elif [ "$1" == "shell" ]; then
     exec /bin/bash
 else
     /usr/sbin/php-fpm
     exec httpd -DFOREGROUND
 fi
diff --git a/docker/roundcube/rootfs/opt/app-root/src/update-from-source.sh b/docker/roundcube/rootfs/opt/app-root/src/update-from-source.sh
index 90e1f1d3..4d749490 100755
--- a/docker/roundcube/rootfs/opt/app-root/src/update-from-source.sh
+++ b/docker/roundcube/rootfs/opt/app-root/src/update-from-source.sh
@@ -1,37 +1,38 @@
 #!/bin/bash
 #Update from source (rather than via composer which updates to the latest commit)
 
 for directory in roundcubemail syncroton iRony chwala autoconf freebusy
 do
     if [ -d /src.orig/$directory ]; then
-        rsync -av \
+        rsync -a \
             --no-links \
             --exclude=vendor \
             --exclude=temp \
             --exclude=config \
             --exclude=logs \
             --exclude=.git \
+            --exclude=.cache \
             --exclude=config.inc.php \
             --exclude=composer.json \
             --exclude=composer.lock \
             /src.orig/$directory/ /opt/app-root/src/$directory
     fi
 done
 
 if [ -d /src.orig/roundcubemail-plugins-kolab/plugins ]; then
     pushd /src.orig/roundcubemail-plugins-kolab/plugins
 
     for plugin in $(ls -1d)
     do
         if [ -d /opt/app-root/src/roundcubemail/plugins/${plugin}/ ]; then
-            rsync -av \
+            rsync -a \
                 --exclude=vendor \
                 --exclude=composer.json \
                 --exclude=config.inc.php \
                 $plugin/ /opt/app-root/src/roundcubemail/plugins/$plugin
         fi
     done
     popd
 fi
 
 # ./reload.sh