diff --git a/core/base/Dockerfile b/core/base/Dockerfile
index 20d17f30..125d576e 100644
--- a/core/base/Dockerfile
+++ b/core/base/Dockerfile
@@ -49,26 +49,19 @@ ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 COPY requirements-${MAILU_DEPS}.txt ./
 COPY libs/ libs/
 
-RUN set -euxo pipefail \
-  ; pip install -r requirements-${MAILU_DEPS}.txt || \
-    { \
-      machine="$(uname -m)" \
-    ; deps="build-base gcc libffi-dev python3-dev" \
-    ; [[ "${machine}" != x86_64 ]] && \
-        deps="${deps} cargo git libressl-dev mariadb-connector-c-dev postgresql-dev" \
-    ; apk add --virtual .build-deps ${deps} \
-    ; [[ "${machine}" == armv7* ]] && \
-        mkdir -p /root/.cargo/registry/index && \
-        git clone --bare https://github.com/rust-lang/crates.io-index.git /root/.cargo/registry/index/github.com-1285ae84e5963aae \
-    ; pip install -r requirements-${MAILU_DEPS}.txt \
-    ; rm -rf /root/.cargo /tmp/*.pem \
-  ; } \
-  ; rm -rf /root/.cache
-
 ARG SNUFFLEUPAGUS_VERSION=0.8.3
 ENV SNUFFLEUPAGUS_URL https://github.com/jvoisin/snuffleupagus/archive/refs/tags/v$SNUFFLEUPAGUS_VERSION.tar.gz
 
 RUN set -euxo pipefail \
+  ;  machine="$(uname -m)" \
+  ; deps="build-base gcc libffi-dev python3-dev" \
+  ; [[ "${machine}" != x86_64 ]] && \
+      deps="${deps} cargo git libressl-dev mariadb-connector-c-dev postgresql-dev" \
+  ; apk add --virtual .build-deps ${deps} \
+  ; [[ "${machine}" == armv7* ]] && \
+      mkdir -p /root/.cargo/registry/index && \
+      git clone --bare https://github.com/rust-lang/crates.io-index.git /root/.cargo/registry/index/github.com-1285ae84e5963aae \
+  ; pip install -r requirements-${MAILU_DEPS}.txt \
   ; curl -sL  ${SNUFFLEUPAGUS_URL} | tar xz \
   ; cd snuffleupagus-$SNUFFLEUPAGUS_VERSION \
   ; rm -rf src/tests/*php7*/ src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/ \
@@ -80,7 +73,7 @@ RUN set -euxo pipefail \
   ; pecl install vld-beta \
   ; make -j $(grep -c processor /proc/cpuinfo) release \
   ; cp src/.libs/snuffleupagus.so /app \
-  ; apk del -r .build-deps
+  ; rm -rf /root/.cargo /tmp/*.pem /root/.cache
 
 # base mailu image
 FROM system
diff --git a/webmails/Dockerfile b/webmails/Dockerfile
index 2ae8a8f0..77bc65f3 100644
--- a/webmails/Dockerfile
+++ b/webmails/Dockerfile
@@ -22,9 +22,8 @@ RUN set -euxo pipefail \
   ; gpg --import /tmp/snappymail.asc \
   ; gpg --import /tmp/roundcube.asc \
   ; echo extension=snuffleupagus > /etc/php81/conf.d/snuffleupagus.ini \
-  ; rm -f /tmp/*asc \
-  ; mkdir -p /run/nginx \
-  ; mkdir -p /conf
+  ; rm -f /tmp/roundcube.asc /tmp/snappymail.asc \
+  ; mkdir -p /run/nginx /conf
 
 # roundcube
 ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.5.3/roundcubemail-1.5.3-complete.tar.gz