diff --git a/Dockerfile b/Dockerfile
index a36c1377141c66f7910596c237c2d68ff68cdeb4..9213f096e9290313f425c5a8fa26698619a8de4d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ADD . /build
 RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends bash curl make patch rsync default-jre-headless wget unzip
 RUN /build/install-roundcube --version=${RC_VERSION} --destdir=/build/src build && echo ${RC_VERSION} > /build/src/.rc_version
 
-FROM registry.git.autistici.org/ai3/docker/apache2-php-base:master
+FROM registry.git.autistici.org/ai3/docker/apache2-php-base:s6
 
 COPY conf /tmp/conf
 COPY build.sh /tmp/build.sh
diff --git a/conf/chaperone.d/roundcube-setup.conf b/conf/chaperone.d/roundcube-setup.conf
deleted file mode 100644
index 1703d69920f7068ba5558beb3813f523ac1ac280..0000000000000000000000000000000000000000
--- a/conf/chaperone.d/roundcube-setup.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-roundcube_setup.service: {
-    type: oneshot,
-    stdout: inherit,
-    service_groups: INIT,
-    process_timeout: 600,
-    command: "/start.sh",
-}
-
diff --git a/conf/cont-init.d/90roundcube b/conf/cont-init.d/90roundcube
new file mode 100755
index 0000000000000000000000000000000000000000..3983990c4e8e542501387dfad4f988b15f677390
--- /dev/null
+++ b/conf/cont-init.d/90roundcube
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+sh /start.sh
+
diff --git a/conf/php/7.3/fpm/pool.d/www.conf b/conf/php/7.4/fpm/pool.d/www.conf
similarity index 96%
rename from conf/php/7.3/fpm/pool.d/www.conf
rename to conf/php/7.4/fpm/pool.d/www.conf
index ee845a6d9c83878bbf368401929e7dfa3605cd9e..2c6fb1706229040dd2e7fb3805e9ab0548907aa4 100644
--- a/conf/php/7.3/fpm/pool.d/www.conf
+++ b/conf/php/7.4/fpm/pool.d/www.conf
@@ -1,5 +1,5 @@
 [www]
-listen = /run/php/php7.3-fpm.sock
+listen = /run/php/php7.4-fpm.sock
 
 pm = dynamic
 pm.max_children = 80