diff --git a/nextcloud/11.0/Dockerfile b/nextcloud/11.0/Dockerfile
index 31d4f27..40c50ad 100644
--- a/nextcloud/11.0/Dockerfile
+++ b/nextcloud/11.0/Dockerfile
@@ -14,7 +14,8 @@ ENV UID=991 GID=991 \
     DB_TYPE=sqlite3 \
     DOMAIN=localhost
 
-RUN BUILD_DEPS=" \
+RUN apk -U upgrade \
+ && apk add -t build-dependencies \
     gnupg \
     tar \
     build-base \
@@ -22,14 +23,16 @@ RUN BUILD_DEPS=" \
     automake \
     pcre-dev \
     libtool \
-    samba-dev" \
- && apk -U upgrade && apk add \
-    ${BUILD_DEPS} \
+    samba-dev \
+ && apk add \
     libressl \
     ca-certificates \
     libsmbclient \
     tzdata \
- && pecl install smbclient apcu redis \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
  && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
  && echo "extension=redis.so" > /php/conf.d/redis.ini \
  && mkdir /nextcloud \
@@ -50,7 +53,7 @@ RUN BUILD_DEPS=" \
  && echo "All seems good, now unpacking ${NEXTCLOUD_TARBALL}..." \
  && tar xjf ${NEXTCLOUD_TARBALL} --strip 1 -C /nextcloud \
  && update-ca-certificates \
- && apk del ${BUILD_DEPS} \
+ && apk del build-dependencies \
  && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
 
 COPY rootfs /
diff --git a/nextcloud/12.0/Dockerfile b/nextcloud/12.0/Dockerfile
index f6a8c6a..70d8b24 100644
--- a/nextcloud/12.0/Dockerfile
+++ b/nextcloud/12.0/Dockerfile
@@ -14,7 +14,8 @@ ENV UID=991 GID=991 \
     DB_TYPE=sqlite3 \
     DOMAIN=localhost
 
-RUN BUILD_DEPS=" \
+RUN apk -U upgrade \
+ && apk add -t build-dependencies \
     gnupg \
     tar \
     build-base \
@@ -22,14 +23,16 @@ RUN BUILD_DEPS=" \
     automake \
     pcre-dev \
     libtool \
-    samba-dev" \
- && apk -U upgrade && apk add \
-    ${BUILD_DEPS} \
+    samba-dev \
+ && apk add \
     libressl \
     ca-certificates \
     libsmbclient \
     tzdata \
- && pecl install smbclient apcu redis \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
  && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
  && echo "extension=redis.so" > /php/conf.d/redis.ini \
  && mkdir /nextcloud \
@@ -50,7 +53,7 @@ RUN BUILD_DEPS=" \
  && echo "All seems good, now unpacking ${NEXTCLOUD_TARBALL}..." \
  && tar xjf ${NEXTCLOUD_TARBALL} --strip 1 -C /nextcloud \
  && update-ca-certificates \
- && apk del ${BUILD_DEPS} \
+ && apk del build-dependencies \
  && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
 
 COPY rootfs /
diff --git a/nextcloud/daily/Dockerfile b/nextcloud/daily/Dockerfile
index c30d3c2..4a4b23a 100644
--- a/nextcloud/daily/Dockerfile
+++ b/nextcloud/daily/Dockerfile
@@ -11,7 +11,8 @@ ENV UID=991 GID=991 \
     DB_TYPE=sqlite3 \
     DOMAIN=localhost
 
-RUN BUILD_DEPS=" \
+RUN apk -U upgrade \
+ && apk add -t build-dependencies \
     gnupg \
     tar \
     build-base \
@@ -19,14 +20,16 @@ RUN BUILD_DEPS=" \
     automake \
     pcre-dev \
     libtool \
-    samba-dev" \
- && apk -U upgrade && apk add \
-    ${BUILD_DEPS} \
+    samba-dev \
+ && apk add \
     libressl \
     ca-certificates \
     libsmbclient \
     tzdata \
- && pecl install smbclient apcu redis \
+ && pecl install \
+    smbclient \
+    apcu \
+    redis \
  && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
  && echo "extension=redis.so" > /php/conf.d/redis.ini \
  && mkdir /nextcloud \
@@ -39,7 +42,7 @@ RUN BUILD_DEPS=" \
  && if [ "${CHECKSUM_STATE}" != "OK" ]; then echo "Warning! Checksum does not match!" && exit 1; fi \
  && tar xjf latest.tar.bz2 --strip 1 -C /nextcloud \
  && update-ca-certificates \
- && apk del ${BUILD_DEPS} php7-pear php7-dev \
+ && apk del build-dependencies \
  && rm -rf /var/cache/apk/* /tmp/*
 
 COPY rootfs /