diff --git a/Dockerfile b/Dockerfile
index 5bc0187..3a48bbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN wget https://github.com/nextcloud/twofactor_u2f/archive/refs/tags/$U2F_VERSI
 RUN echo "$U2F_SHA256_SUM  $U2F_VERSION.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/twofactor_u2f
 RUN tar xzf $U2F_VERSION.tar.gz -C /var/lib/nextcloud/apps/twofactor_u2f --strip 1
+RUN cd /var/lib/nextcloud/apps/twofactor_u2f && composer install --no-dev -o && npm ci && npm run build
 
 ENV POLLS_VERSION=3.1.0
 ENV POLLS_SHA256_SUM=16273dc0cd018429f27371ae024c1b0fbd12c16d785dff18dcc2b131a490cbb7
@@ -39,6 +40,7 @@ RUN wget https://github.com/nextcloud/contacts/archive/refs/tags/$CONTACTS_VERSI
 RUN echo "$CONTACTS_SHA256_SUM  $CONTACTS_VERSION.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/contacts
 RUN tar xzf $CONTACTS_VERSION.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1
+RUN cd /var/lib/nextcloud/apps/contacts && composer install --no-dev -o && npm ci && npm run build
 
 ENV CALENDAR_VERSION=v2.3.2
 ENV CALENDAR_SHA256_SUM=1dcadd5a431907a3135aa31837a0c60b01455f84db86b74731454aeda86ee85e
@@ -46,6 +48,7 @@ RUN wget https://github.com/nextcloud/calendar/archive/refs/tags/$CALENDAR_VERSI
 RUN echo "$CALENDAR_SHA256_SUM  $CALENDAR_VERSION.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/calendar
 RUN tar xzf $CALENDAR_VERSION.tar.gz -C /var/lib/nextcloud/apps/calendar --strip 1
+RUN cd /var/lib/nextcloud/apps/calendar && composer install --no-dev -o && npm ci && npm run build
 
 ENV TASKS_VERSION=v0.14.1
 ENV TASKS_SHA256_SUM=0326d6b80d7bddf7f015bff5c75725897b26575300b2c2b15c8710e8f4d20d41
@@ -68,13 +71,6 @@ RUN echo "$NEWS_SHA256_SUM  news.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/news
 RUN tar xzf news.tar.gz -C /var/lib/nextcloud/apps/news --strip 1
 
-ENV EMAIL_VERSION=v1.10.3
-ENV EMAIL_SHA256_SUM=1d03d78936f04286d03432b26b916fd9a9f94b76169e2402aac42ff9f3c9da96
-RUN wget https://github.com/nextcloud/mail/archive/refs/tags/$EMAIL_VERSION.tar.gz
-RUN echo "$EMAIL_SHA256_SUM  $EMAIL_VERSION.tar.gz" | sha256sum -c - || exit 1
-RUN mkdir /var/lib/nextcloud/apps/mail
-#RUN tar xzf $EMAIL_VERSION.tar.gz -C /var/lib/nextcloud/apps/mail --strip 1
-
 ENV MASTODON_INTEGRATION_VERSION=1.0.1
 ENV MASTODON_INTEGRATION_SHA256_SUM=fabfd6078be4a0b0cc7066624705cb1781724839a1a0c1a67c6410a3fda0810d
 RUN wget https://github.com/nextcloud/integration_mastodon/releases/download/v$MASTODON_INTEGRATION_VERSION/integration_mastodon-$MASTODON_INTEGRATION_VERSION.tar.gz