diff --git a/Dockerfile b/Dockerfile
index 773d5f0..f36595e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,5 @@
 FROM alpine:3.14 AS builder
 
-RUN apk --no-cache add \
-	composer \
-	npm
-
-RUN npm install --global webpack
-
 ENV NC_VERSION=22.1.0
 ENV NC_SHA256_SUM=4820808f799146853604e1fa27d7f292449018a44dc73bf928a97b02028318ba
 RUN wget https://download.nextcloud.com/server/releases/nextcloud-$NC_VERSION.tar.bz2
@@ -14,20 +8,18 @@ RUN mkdir -p /var/lib/nextcloud
 RUN tar xjf nextcloud-$NC_VERSION.tar.bz2 -C /var/lib/nextcloud --strip 1
 
 ENV TFA_VERSION=v6.1.0
-ENV TFA_SHA256_SUM=e640d59af3f595ad987cf7bd0e1ce4d043541e5817482a613eacd6b123d0b8ad
-RUN wget https://github.com/nextcloud/twofactor_totp/archive/refs/tags/$TFA_VERSION.tar.gz
-RUN echo "$TFA_SHA256_SUM  $TFA_VERSION.tar.gz" | sha256sum -c - || exit 1
+ENV TFA_SHA256_SUM=05dcf74305d60fded13577a5ab48aef8538aa34efb209aac50e24704a6c4b8a3
+RUN wget https://github.com/nextcloud-releases/twofactor_totp/releases/download/$TFA_VERSION/twofactor_totp.tar.gz
+RUN echo "$TFA_SHA256_SUM  twofactor_totp.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir /var/lib/nextcloud/apps/twofactor_totp
-RUN tar xzf $TFA_VERSION.tar.gz -C /var/lib/nextcloud/apps/twofactor_totp --strip 1
-RUN cd /var/lib/nextcloud/apps/twofactor_totp && composer install --no-dev -o && npm ci && npm run build
+RUN tar xzf twofactor_totp.tar.gz -C /var/lib/nextcloud/apps/twofactor_totp --strip 1
 
 ENV U2F_VERSION=v6.2.0
-ENV U2F_SHA256_SUM=a52b5513696134b7d4a8d21d24c23c4c49d90dd0a5d8ea68ddca52bc927c22f1
-RUN wget https://github.com/nextcloud/twofactor_u2f/archive/refs/tags/$U2F_VERSION.tar.gz
-RUN echo "$U2F_SHA256_SUM  $U2F_VERSION.tar.gz" | sha256sum -c - || exit 1
+ENV U2F_SHA256_SUM=c8e3519c4a7639fd229ceb0dc32acccc64ffb6facb6fad946e02afce49023e67
+RUN wget https://github.com/nextcloud-releases/twofactor_u2f/releases/download/$U2F_VERSION/twofactor_u2f.tar.gz
+RUN echo "$U2F_SHA256_SUM  twofactor_u2f.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
+RUN tar xzf twofactor_u2f.tar.gz -C /var/lib/nextcloud/apps/twofactor_u2f --strip 1
 
 ENV POLLS_VERSION=3.1.0
 ENV POLLS_SHA256_SUM=16273dc0cd018429f27371ae024c1b0fbd12c16d785dff18dcc2b131a490cbb7
@@ -37,20 +29,18 @@ RUN mkdir /var/lib/nextcloud/apps/polls
 RUN tar xzf polls-$POLLS_VERSION.tar.gz -C /var/lib/nextcloud/apps/polls --strip 1
 
 ENV CONTACTS_VERSION=v4.0.1
-ENV CONTACTS_SHA256_SUM=bab5bdec9b0a7cd34c13ca52937326cba993bd9d81126156689ec74a4703756d
-RUN wget https://github.com/nextcloud/contacts/archive/refs/tags/$CONTACTS_VERSION.tar.gz
-RUN echo "$CONTACTS_SHA256_SUM  $CONTACTS_VERSION.tar.gz" | sha256sum -c - || exit 1
+ENV CONTACTS_SHA256_SUM=6727e17e262a73ed740e5cdb7499708a5e5b4ddc7f855065b652c3910794789c
+RUN wget https://github.com/nextcloud-releases/contacts/releases/download/$CONTACTS_VERSION/contacts.tar.gz
+RUN echo "$CONTACTS_SHA256_SUM  contacts.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 run build
+RUN tar xzf contacts.tar.gz -C /var/lib/nextcloud/apps/contacts --strip 1
 
 ENV CALENDAR_VERSION=v2.3.2
-ENV CALENDAR_SHA256_SUM=1dcadd5a431907a3135aa31837a0c60b01455f84db86b74731454aeda86ee85e
-RUN wget https://github.com/nextcloud/calendar/archive/refs/tags/$CALENDAR_VERSION.tar.gz
-RUN echo "$CALENDAR_SHA256_SUM  $CALENDAR_VERSION.tar.gz" | sha256sum -c - || exit 1
+ENV CALENDAR_SHA256_SUM=50ebeacd30ddebf749370e7258990af37e522e8e8101e57e6f2e2510d7fe0b14
+RUN wget https://github.com/nextcloud-releases/calendar/releases/download/$CALENDAR_VERSION/calendar.tar.gz
+RUN echo "$CALENDAR_SHA256_SUM  calendar.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 && npm install && npm run build
+RUN tar xzf calendar.tar.gz -C /var/lib/nextcloud/apps/calendar --strip 1
 
 ENV TASKS_VERSION=v0.14.1
 ENV TASKS_SHA256_SUM=0326d6b80d7bddf7f015bff5c75725897b26575300b2c2b15c8710e8f4d20d41