diff --git a/nextcloud/Dockerfile.18.0 b/nextcloud/Dockerfile.18.0
deleted file mode 100644
index 1ee2c68..0000000
--- a/nextcloud/Dockerfile.18.0
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM hoellen/nginx-php:7.3
-
-ARG NEXTCLOUD_VERSION=18.0.14
-ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
-
-ENV UID=991 GID=991 \
-    UPLOAD_MAX_SIZE=10G \
-    APC_SHM_SIZE=128M \
-    OPCACHE_MEM_SIZE=128 \
-    MEMORY_LIMIT=512M \
-    PHP_MAX_CHILDREN=15 \
-    PHP_START_SERVERS=2 \
-    PHP_MIN_SPARE_SERVERS=1 \
-    PHP_MAX_SPARE_SERVERS=6 \
-    CRON_PERIOD=15m \
-    CRON_MEMORY_LIMIT=1g \
-    TZ=Etc/UTC \
-    DB_TYPE=sqlite3 \
-    DOMAIN=localhost \
-    CHECK_PERMISSIONS=1
-
-RUN apk -U upgrade \
- && apk add -t build-dependencies \
-    gnupg \
-    tar \
-    build-base \
-    autoconf \
-    automake \
-    pcre-dev \
-    libtool \
-    samba-dev \
-    imagemagick-dev \
- && apk add \
-    libressl \
-    ca-certificates \
-    libsmbclient \
-    imagemagick-libs \
-    tzdata \
- && pecl channel-update pecl.php.net \
- && pecl install \
-    smbclient \
-    apcu \
-    redis \
-    imagick \
- && echo "extension=smbclient.so" > /php/conf.d/smbclient.ini \
- && echo "extension=redis.so" > /php/conf.d/redis.ini \
- && echo "extension=imagick.so" > /php/conf.d/imagick.ini \
- && mkdir /nextcloud \
- && cd /tmp \
- && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.asc \
- && wget -q https://nextcloud.com/nextcloud.asc \
- && echo "Verifying both integrity and authenticity of ${NEXTCLOUD_TARBALL}..." \
- && CHECKSUM_STATE=$(echo -n $(sha512sum -c ${NEXTCLOUD_TARBALL}.sha512) | tail -c 2) \
- && if [ "${CHECKSUM_STATE}" != "OK" ]; then echo "Warning! Checksum does not match!" && exit 1; fi \
- && gpg --import nextcloud.asc \
- && FINGERPRINT="$(LANG=C gpg --verify ${NEXTCLOUD_TARBALL}.asc ${NEXTCLOUD_TARBALL} 2>&1 \
-  | sed -n "s#Primary key fingerprint: \(.*\)#\1#p")" \
- && if [ -z "${FINGERPRINT}" ]; then echo "Warning! Invalid GPG signature!" && exit 1; fi \
- && if [ "${FINGERPRINT}" != "${GPG_nextcloud}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \
- && echo "All seems good, now unpacking ${NEXTCLOUD_TARBALL}..." \
- && tar xjf ${NEXTCLOUD_TARBALL} --strip 1 -C /nextcloud \
- && update-ca-certificates \
- && apk del build-dependencies \
- && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-VOLUME /data /config /apps2 /nextcloud/themes
-
-EXPOSE 8888
-
-LABEL description="A server software for creating file hosting services" \
-      nextcloud="Nextcloud v${NEXTCLOUD_VERSION}" \
-      maintainer="hoellen <info@hoellen.eu>"
-
-CMD ["run.sh"]
diff --git a/nextcloud/Dockerfile.21.0 b/nextcloud/Dockerfile.21.0
index f62b96b..c485367 100644
--- a/nextcloud/Dockerfile.21.0
+++ b/nextcloud/Dockerfile.21.0
@@ -1,6 +1,6 @@
 FROM hoellen/nginx-php:7.4
 
-ARG NEXTCLOUD_VERSION=21.0.0RC2
+ARG NEXTCLOUD_VERSION=21.0.0
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"
 
 ENV UID=991 GID=991 \
@@ -49,9 +49,9 @@ RUN apk -U upgrade \
  && mkdir /nextcloud \
  && cd /tmp \
  && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL} \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.sha512 \
- && wget -q https://download.nextcloud.com/server/prereleases/${NEXTCLOUD_TARBALL}.asc \
+ && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL} \
+ && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.sha512 \
+ && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.asc \
  && wget -q https://nextcloud.com/nextcloud.asc \
  && echo "Verifying both integrity and authenticity of ${NEXTCLOUD_TARBALL}..." \
  && CHECKSUM_STATE=$(echo -n $(sha512sum -c ${NEXTCLOUD_TARBALL}.sha512) | tail -c 2) \
diff --git a/nextcloud/README.md b/nextcloud/README.md
index 3ac9cc8..d5f476e 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -21,10 +21,11 @@
 - Environment variables provided (see below).
 
 ### Tags
-- **latest** : latest stable version (20.0)
-- **20.0** : latest 20.0.x version (stable)
-- **19.0** : latest 19.0.x version (old stable)
-- **18.0** : latest 18.0.x version (deprecated)
+- **latest** : latest stable version (21.0)
+- **21.0** : latest 20.0.x version (stable)
+- **20.0** : latest 20.0.x version (old stable)
+- **19.0** : latest 19.0.x version (deprecated)
+- ~~**18.0** : latest 18.0.x version (end-of-life)~~
 - ~~**17.0** : latest 17.0.x version (end-of-life)~~
 - ~~**16.0** : latest 16.0.x version (end-of-life)~~
 - ~~**15.0** : latest 15.0.x version (end-of-life)~~