diff --git a/.examples/README.md b/.examples/README.md
index d2183447..f2842d92 100644
--- a/.examples/README.md
+++ b/.examples/README.md
@@ -32,11 +32,6 @@ The required steps for each optional/recommended package that is not already in
 #### PHP Module bz2
 `docker-php-ext-install bz2`  
 
-#### PHP Module imagick
-`apt install libmagickwand-dev`  
-`pecl install imagick`  
-`docker-php-ext-enable imagick`  
-
 #### PHP Module imap
 `apt install libc-client-dev libkrb5-dev`  
 `docker-php-ext-configure imap --with-kerberos --with-imap-ssl`  
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
index 2dc06e15..64c0570f 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
index 4a111610..0436d37d 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/Dockerfile
@@ -1,3 +1,3 @@
-FROM nextcloud:fpm
+FROM nextcloud:fpm-alpine
 
 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
index 49fafabc..424ef057 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
index 2d14e230..49a19c35 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index 3596e989..eb91bbdb 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
index 2d14e230..49a19c35 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
index f69bb72e..596568d6 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index 7a1fab7d..b1ff459c 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
@@ -10,7 +10,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
index 2d14e230..49a19c35 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
index 6d1e70a9..3d60f7ee 100644
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
diff --git a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl/mariadb/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
index b6ca391f..aaec5a2e 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
index 4a111610..0436d37d 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/Dockerfile
@@ -1,3 +1,3 @@
-FROM nextcloud:fpm
+FROM nextcloud:fpm-alpine
 
 COPY redis.config.php /usr/src/nextcloud/config/redis.config.php
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
index dd98915e..30aee4d9 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   redis:
-    image: redis
+    image: redis:alpine
     restart: always
 
   app:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 17a656de..5fc70af1 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index a2bda83b..2e40e8d7 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 9bed1218..39e85f71 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
@@ -10,7 +10,7 @@ services:
       - db.env
 
   app:
-    image: nextcloud:fpm
+    image: nextcloud:fpm-alpine
     restart: always
     volumes:
       - nextcloud:/var/www/html
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
index d6eac3e8..9e620aff 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx
+FROM nginx:alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
index 518f104d..26660646 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
@@ -1,4 +1,3 @@
-user  www-data;
 worker_processes  1;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile
index fc5e848c..178ca844 100644
--- a/.examples/dockerfiles/full/apache/Dockerfile
+++ b/.examples/dockerfiles/full/apache/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
     && apt-get update && apt-get install -y \
         supervisor \
         ffmpeg \
-        libmagickwand-dev \
+        libbz2-dev \
         libgmp3-dev \
         libc-client-dev \
         libkrb5-dev \
@@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
     && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
     && docker-php-ext-install bz2 gmp imap \
-    && pecl install imagick smbclient \
-    && docker-php-ext-enable imagick smbclient \
+    && pecl install smbclient \
+    && docker-php-ext-enable smbclient \
     && mkdir /var/log/supervisord /var/run/supervisord
 
 COPY supervisord.conf /etc/supervisor/supervisord.conf
diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile
index b7311258..b0c61d64 100644
--- a/.examples/dockerfiles/full/fpm/Dockerfile
+++ b/.examples/dockerfiles/full/fpm/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
     && apt-get update && apt-get install -y \
         supervisor \
         ffmpeg \
-        libmagickwand-dev \
+        libbz2-dev \
         libgmp3-dev \
         libc-client-dev \
         libkrb5-dev \
@@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
     && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
     && ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
     && docker-php-ext-install bz2 gmp imap \
-    && pecl install imagick smbclient \
-    && docker-php-ext-enable imagick smbclient \
+    && pecl install smbclient \
+    && docker-php-ext-enable smbclient \
     && mkdir /var/log/supervisord /var/run/supervisord
 
 COPY supervisord.conf /etc/supervisor/supervisord.conf
diff --git a/.travis.yml b/.travis.yml
index e042d1fc..6e36fdcd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,13 +50,7 @@ jobs:
         - ./generate-stackbrew-library.sh
 
     - stage: test images
-      env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386
-    - env: VERSION=12.0 VARIANT=fpm ARCH=amd64
-    - env: VERSION=12.0 VARIANT=fpm ARCH=i386
-    - env: VERSION=12.0 VARIANT=apache ARCH=amd64
-    - env: VERSION=12.0 VARIANT=apache ARCH=i386
-    - env: VERSION=13.0 VARIANT=fpm-alpine ARCH=amd64
+      env: VERSION=13.0 VARIANT=fpm-alpine ARCH=amd64
     - env: VERSION=13.0 VARIANT=fpm-alpine ARCH=i386
     - env: VERSION=13.0 VARIANT=fpm ARCH=amd64
     - env: VERSION=13.0 VARIANT=fpm ARCH=i386
@@ -68,3 +62,9 @@ jobs:
     - env: VERSION=14.0 VARIANT=fpm ARCH=i386
     - env: VERSION=14.0 VARIANT=apache ARCH=amd64
     - env: VERSION=14.0 VARIANT=apache ARCH=i386
+    - env: VERSION=15.0 VARIANT=fpm-alpine ARCH=amd64
+    - env: VERSION=15.0 VARIANT=fpm-alpine ARCH=i386
+    - env: VERSION=15.0 VARIANT=fpm ARCH=amd64
+    - env: VERSION=15.0 VARIANT=fpm ARCH=i386
+    - env: VERSION=15.0 VARIANT=apache ARCH=amd64
+    - env: VERSION=15.0 VARIANT=apache ARCH=i386
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index c9eca58c..5c096bb4 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,14 +52,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -106,7 +109,7 @@ RUN a2enmod rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 13.0.7
+ENV NEXTCLOUD_VERSION 13.0.8
 
 RUN set -ex; \
     fetchDeps=" \
@@ -122,7 +125,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index 6498d631..db164624 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 797a7040..b2cb6b8c 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex; \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
+        imagemagick-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -45,14 +46,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \
@@ -87,7 +90,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 13.0.7
+ENV NEXTCLOUD_VERSION 13.0.8
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -101,7 +104,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index 6498d631..db164624 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 1b2df5ff..ad42be59 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,14 +52,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -98,7 +101,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 13.0.7
+ENV NEXTCLOUD_VERSION 13.0.8
 
 RUN set -ex; \
     fetchDeps=" \
@@ -114,7 +117,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index 6498d631..db164624 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index e2b3852e..5db06fee 100644
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,14 +52,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -106,7 +109,7 @@ RUN a2enmod rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 14.0.3
+ENV NEXTCLOUD_VERSION 14.0.4
 
 RUN set -ex; \
     fetchDeps=" \
@@ -122,7 +125,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index 6498d631..db164624 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile
index 4a8c15bf..d21cf51f 100644
--- a/14.0/fpm-alpine/Dockerfile
+++ b/14.0/fpm-alpine/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex; \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
+        imagemagick-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -45,14 +46,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \
@@ -87,7 +90,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 14.0.3
+ENV NEXTCLOUD_VERSION 14.0.4
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -101,7 +104,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index 6498d631..db164624 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile
index f6a41564..7b388db1 100644
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,14 +52,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -98,7 +101,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 14.0.3
+ENV NEXTCLOUD_VERSION 14.0.4
 
 RUN set -ex; \
     fetchDeps=" \
@@ -114,7 +117,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index 6498d631..db164624 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/12.0/apache/Dockerfile b/15.0/apache/Dockerfile
similarity index 90%
rename from 12.0/apache/Dockerfile
rename to 15.0/apache/Dockerfile
index c49048f0..b1035da5 100644
--- a/12.0/apache/Dockerfile
+++ b/15.0/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.1-apache-stretch
+FROM php:7.2-apache-stretch
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,14 +52,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -106,7 +109,11 @@ RUN a2enmod rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 12.0.12
+<<<<<<< HEAD:15.0/apache/Dockerfile
+ENV NEXTCLOUD_VERSION 15.0.0
+=======
+ENV NEXTCLOUD_VERSION 12.0.13
+>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/apache/Dockerfile
 
 RUN set -ex; \
     fetchDeps=" \
@@ -122,7 +129,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/12.0/apache/config/apache-pretty-urls.config.php b/15.0/apache/config/apache-pretty-urls.config.php
similarity index 100%
rename from 12.0/apache/config/apache-pretty-urls.config.php
rename to 15.0/apache/config/apache-pretty-urls.config.php
diff --git a/12.0/apache/config/apcu.config.php b/15.0/apache/config/apcu.config.php
similarity index 100%
rename from 12.0/apache/config/apcu.config.php
rename to 15.0/apache/config/apcu.config.php
diff --git a/12.0/apache/config/apps.config.php b/15.0/apache/config/apps.config.php
similarity index 100%
rename from 12.0/apache/config/apps.config.php
rename to 15.0/apache/config/apps.config.php
diff --git a/12.0/apache/config/autoconfig.php b/15.0/apache/config/autoconfig.php
similarity index 100%
rename from 12.0/apache/config/autoconfig.php
rename to 15.0/apache/config/autoconfig.php
diff --git a/12.0/apache/cron.sh b/15.0/apache/cron.sh
similarity index 100%
rename from 12.0/apache/cron.sh
rename to 15.0/apache/cron.sh
diff --git a/12.0/fpm/entrypoint.sh b/15.0/apache/entrypoint.sh
similarity index 99%
rename from 12.0/fpm/entrypoint.sh
rename to 15.0/apache/entrypoint.sh
index 6498d631..db164624 100755
--- a/12.0/fpm/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/12.0/apache/upgrade.exclude b/15.0/apache/upgrade.exclude
similarity index 100%
rename from 12.0/apache/upgrade.exclude
rename to 15.0/apache/upgrade.exclude
diff --git a/12.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile
similarity index 88%
rename from 12.0/fpm-alpine/Dockerfile
rename to 15.0/fpm-alpine/Dockerfile
index 00ce909c..3fbdc0b6 100644
--- a/12.0/fpm-alpine/Dockerfile
+++ b/15.0/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.1-fpm-alpine3.8
+FROM php:7.2-fpm-alpine3.8
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -28,6 +28,7 @@ RUN set -ex; \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
+        imagemagick-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -45,14 +46,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \
@@ -87,7 +90,11 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 12.0.12
+<<<<<<< HEAD:15.0/fpm-alpine/Dockerfile
+ENV NEXTCLOUD_VERSION 15.0.0
+=======
+ENV NEXTCLOUD_VERSION 12.0.13
+>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/fpm-alpine/Dockerfile
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -101,7 +108,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/12.0/fpm-alpine/config/apcu.config.php b/15.0/fpm-alpine/config/apcu.config.php
similarity index 100%
rename from 12.0/fpm-alpine/config/apcu.config.php
rename to 15.0/fpm-alpine/config/apcu.config.php
diff --git a/12.0/fpm-alpine/config/apps.config.php b/15.0/fpm-alpine/config/apps.config.php
similarity index 100%
rename from 12.0/fpm-alpine/config/apps.config.php
rename to 15.0/fpm-alpine/config/apps.config.php
diff --git a/12.0/fpm-alpine/config/autoconfig.php b/15.0/fpm-alpine/config/autoconfig.php
similarity index 100%
rename from 12.0/fpm-alpine/config/autoconfig.php
rename to 15.0/fpm-alpine/config/autoconfig.php
diff --git a/12.0/fpm-alpine/cron.sh b/15.0/fpm-alpine/cron.sh
similarity index 100%
rename from 12.0/fpm-alpine/cron.sh
rename to 15.0/fpm-alpine/cron.sh
diff --git a/12.0/apache/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh
similarity index 99%
rename from 12.0/apache/entrypoint.sh
rename to 15.0/fpm-alpine/entrypoint.sh
index 6498d631..db164624 100755
--- a/12.0/apache/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/12.0/fpm-alpine/upgrade.exclude b/15.0/fpm-alpine/upgrade.exclude
similarity index 100%
rename from 12.0/fpm-alpine/upgrade.exclude
rename to 15.0/fpm-alpine/upgrade.exclude
diff --git a/12.0/fpm/Dockerfile b/15.0/fpm/Dockerfile
similarity index 90%
rename from 12.0/fpm/Dockerfile
rename to 15.0/fpm/Dockerfile
index a85c2224..9b0b935d 100644
--- a/12.0/fpm/Dockerfile
+++ b/15.0/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:7.1-fpm-stretch
+FROM php:7.2-fpm-stretch
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@@ -33,6 +33,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -51,14 +52,16 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.12; \
+    pecl install APCu-5.1.15; \
     pecl install memcached-3.0.4; \
-    pecl install redis-4.1.1; \
+    pecl install redis-4.2.0; \
+    pecl install imagick-3.4.3; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -98,7 +101,11 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 12.0.12
+<<<<<<< HEAD:15.0/fpm/Dockerfile
+ENV NEXTCLOUD_VERSION 15.0.0
+=======
+ENV NEXTCLOUD_VERSION 12.0.13
+>>>>>>> Add two parameters when Nextcloud is behind a proxy:12.0/fpm/Dockerfile
 
 RUN set -ex; \
     fetchDeps=" \
@@ -114,7 +121,7 @@ RUN set -ex; \
         "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/12.0/fpm/config/apcu.config.php b/15.0/fpm/config/apcu.config.php
similarity index 100%
rename from 12.0/fpm/config/apcu.config.php
rename to 15.0/fpm/config/apcu.config.php
diff --git a/12.0/fpm/config/apps.config.php b/15.0/fpm/config/apps.config.php
similarity index 100%
rename from 12.0/fpm/config/apps.config.php
rename to 15.0/fpm/config/apps.config.php
diff --git a/12.0/fpm/config/autoconfig.php b/15.0/fpm/config/autoconfig.php
similarity index 100%
rename from 12.0/fpm/config/autoconfig.php
rename to 15.0/fpm/config/autoconfig.php
diff --git a/12.0/fpm/cron.sh b/15.0/fpm/cron.sh
similarity index 100%
rename from 12.0/fpm/cron.sh
rename to 15.0/fpm/cron.sh
diff --git a/12.0/fpm-alpine/entrypoint.sh b/15.0/fpm/entrypoint.sh
similarity index 99%
rename from 12.0/fpm-alpine/entrypoint.sh
rename to 15.0/fpm/entrypoint.sh
index 6498d631..db164624 100755
--- a/12.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/12.0/fpm/upgrade.exclude b/15.0/fpm/upgrade.exclude
similarity index 100%
rename from 12.0/fpm/upgrade.exclude
rename to 15.0/fpm/upgrade.exclude
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 9bb6e9eb..4d282f54 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -27,6 +27,7 @@ RUN set -ex; \
         openldap-dev \
         pcre-dev \
         postgresql-dev \
+        imagemagick-dev \
     ; \
     \
     docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@@ -47,11 +48,13 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \
@@ -100,7 +103,7 @@ RUN set -ex; \
         "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 54c28425..d10ae367 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -32,6 +32,7 @@ RUN set -ex; \
         libpng-dev \
         libpq-dev \
         libxml2-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -53,11 +54,13 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -113,7 +116,7 @@ RUN set -ex; \
         "%%BASE_DOWNLOAD_URL%%/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
     gpg --batch --verify nextcloud.tar.bz2.asc nextcloud.tar.bz2; \
     tar -xjf nextcloud.tar.bz2 -C /usr/src/; \
     gpgconf --kill all; \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6498d631..db164624 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -90,7 +90,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                 fi
 
                 if [ "$install" = true ]; then
-                    echo "starting nexcloud installation"
+                    echo "starting nextcloud installation"
                     max_retries=10
                     try=0
                     until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index af901b36..3e72a0c8 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,8 +2,8 @@
 set -Eeuo pipefail
 
 declare -A release_channel=(
-	[production]='13.0.7'
-	[stable]='13.0.7'
+	[production]='13.0.8'
+	[stable]='14.0.4'
 )
 
 self="$(basename "$BASH_SOURCE")"
diff --git a/update.sh b/update.sh
index 16c1104c..8a323635 100755
--- a/update.sh
+++ b/update.sh
@@ -25,9 +25,10 @@ declare -A extras=(
 )
 
 declare -A pecl_versions=(
-	[APCu]='5.1.12'
+	[APCu]='5.1.15'
 	[memcached]='3.0.4'
-	[redis]='4.1.1'
+	[redis]='4.2.0'
+	[imagick]='3.4.3'
 )
 
 variants=(
@@ -36,7 +37,7 @@ variants=(
 	fpm-alpine
 )
 
-min_version='12.0'
+min_version='13.0'
 
 # version_greater_or_equal A B returns whether A >= B
 function version_greater_or_equal() {
@@ -78,6 +79,7 @@ function create_variant() {
 		s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
 		s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
 		s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
+		s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
 	' "$dir/Dockerfile"
 
 	# Copy the shell scripts
@@ -97,7 +99,7 @@ function create_variant() {
 	fi
 
 	for arch in i386 amd64; do
-		travisEnv='\n    - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch$travisEnv"
+		travisEnv='    - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch"'\n'"$travisEnv"
 	done
 }
 
@@ -160,9 +162,10 @@ for version in "${versions_beta[@]}"; do
 	fi
 done
 
+# remove everything after '- stage: test images'
+travis="$(awk '!p; /- stage: test images/ {p=1}' .travis.yml)"
+echo "$travis" > .travis.yml
+
 # replace the fist '-' with ' '
 travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')"
-
-# update .travis.yml
-travis="$(awk -v 'RS=\n\n' '$1 == "-" && $2 == "stage:" && $3 == "test" && $4 == "images" { $0 = "    - stage: test images'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
-echo "$travis"  > .travis.yml
+printf "$travisEnv" >> .travis.yml