diff --git a/roundcube/testing/Dockerfile b/roundcube/testing/Dockerfile
index a10023b..0b32d11 100644
--- a/roundcube/testing/Dockerfile
+++ b/roundcube/testing/Dockerfile
@@ -1,4 +1,12 @@
-FROM roundcube/roundcubemail:1.4.11-apache
+FROM roundcube/roundcubemail:1.4.12-apache
+
+RUN a2enmod remoteip; \
+    echo "RemoteIPHeader X-Forwarded-For" > /etc/apache2/conf-available/remoteip.conf; \
+    a2enconf remoteip; \
+    sed -i -r 's/^ServerTokens .*/ServerTokens Prod/g' /etc/apache2/conf-available/security.conf; \
+    sed -i -r 's/^ServerSignature .*/ServerSignature Off/g' /etc/apache2/conf-available/security.conf; \
+    sed -i -E 's/^LogFormat "%h(.*)/LogFormat "%a\1/g' /etc/apache2/apache2.conf; \
+    echo "expose_php = Off" > /usr/local/etc/php/conf.d/php_version.ini;
 
 RUN set -ex; \
     apt-get update; \
@@ -9,6 +17,14 @@ RUN set -ex; \
     curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer; \
     mv /usr/src/roundcubemail/composer.json-dist /usr/src/roundcubemail/composer.json; \
     \
+    composer \
+        --working-dir=/usr/src/roundcubemail/ \
+        --prefer-dist --prefer-stable \
+        --no-update --no-interaction \
+        --optimize-autoloader --apcu-autoloader \
+        require \
+            roundcube/carddav \
+    ; \
     composer \
         --working-dir=/usr/src/roundcubemail/ \
         --prefer-dist --no-dev \
diff --git a/roundcube/testing/docker-compose.yml b/roundcube/testing/docker-compose.yml
index 79cd11f..919bd1f 100644
--- a/roundcube/testing/docker-compose.yml
+++ b/roundcube/testing/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   app:
     build: .
-    image: rc_test:latest
+    image: rc_test:1.12
     restart: unless-stopped
     depends_on:
       - db