diff --git a/.travis.yml b/.travis.yml
index 99612455..84d805c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,13 +50,7 @@ jobs:
         - ./generate-stackbrew-library.sh
 
     - stage: test images
-      env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=amd64
-    - env: VERSION=16.0-rc VARIANT=fpm-alpine ARCH=i386
-    - env: VERSION=16.0-rc VARIANT=fpm ARCH=amd64
-    - env: VERSION=16.0-rc VARIANT=fpm ARCH=i386
-    - env: VERSION=16.0-rc VARIANT=apache ARCH=amd64
-    - env: VERSION=16.0-rc VARIANT=apache ARCH=i386
-    - env: VERSION=14.0 VARIANT=fpm-alpine ARCH=amd64
+      env: VERSION=14.0 VARIANT=fpm-alpine ARCH=amd64
     - env: VERSION=14.0 VARIANT=fpm-alpine ARCH=i386
     - env: VERSION=14.0 VARIANT=fpm ARCH=amd64
     - env: VERSION=14.0 VARIANT=fpm ARCH=i386
@@ -68,3 +62,9 @@ jobs:
     - env: VERSION=15.0 VARIANT=fpm ARCH=i386
     - env: VERSION=15.0 VARIANT=apache ARCH=amd64
     - env: VERSION=15.0 VARIANT=apache ARCH=i386
+    - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=amd64
+    - env: VERSION=16.0 VARIANT=fpm-alpine ARCH=i386
+    - env: VERSION=16.0 VARIANT=fpm ARCH=amd64
+    - env: VERSION=16.0 VARIANT=fpm ARCH=i386
+    - env: VERSION=16.0 VARIANT=apache ARCH=amd64
+    - env: VERSION=16.0 VARIANT=apache ARCH=i386
diff --git a/16.0-rc/apache/Dockerfile b/16.0/apache/Dockerfile
similarity index 95%
rename from 16.0-rc/apache/Dockerfile
rename to 16.0/apache/Dockerfile
index 4efbff6c..b54fc5bd 100644
--- a/16.0-rc/apache/Dockerfile
+++ b/16.0/apache/Dockerfile
@@ -111,7 +111,7 @@ RUN a2enmod rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 16.0.0RC2
+ENV NEXTCLOUD_VERSION 16.0.0
 
 RUN set -ex; \
     fetchDeps=" \
@@ -122,9 +122,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
     curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
+        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
+        "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 --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/16.0-rc/apache/config/apache-pretty-urls.config.php b/16.0/apache/config/apache-pretty-urls.config.php
similarity index 100%
rename from 16.0-rc/apache/config/apache-pretty-urls.config.php
rename to 16.0/apache/config/apache-pretty-urls.config.php
diff --git a/16.0-rc/apache/config/apcu.config.php b/16.0/apache/config/apcu.config.php
similarity index 100%
rename from 16.0-rc/apache/config/apcu.config.php
rename to 16.0/apache/config/apcu.config.php
diff --git a/16.0-rc/apache/config/apps.config.php b/16.0/apache/config/apps.config.php
similarity index 100%
rename from 16.0-rc/apache/config/apps.config.php
rename to 16.0/apache/config/apps.config.php
diff --git a/16.0-rc/apache/config/autoconfig.php b/16.0/apache/config/autoconfig.php
similarity index 100%
rename from 16.0-rc/apache/config/autoconfig.php
rename to 16.0/apache/config/autoconfig.php
diff --git a/16.0-rc/apache/config/redis.config.php b/16.0/apache/config/redis.config.php
similarity index 100%
rename from 16.0-rc/apache/config/redis.config.php
rename to 16.0/apache/config/redis.config.php
diff --git a/16.0-rc/apache/cron.sh b/16.0/apache/cron.sh
similarity index 100%
rename from 16.0-rc/apache/cron.sh
rename to 16.0/apache/cron.sh
diff --git a/16.0-rc/apache/entrypoint.sh b/16.0/apache/entrypoint.sh
similarity index 100%
rename from 16.0-rc/apache/entrypoint.sh
rename to 16.0/apache/entrypoint.sh
diff --git a/16.0-rc/apache/upgrade.exclude b/16.0/apache/upgrade.exclude
similarity index 100%
rename from 16.0-rc/apache/upgrade.exclude
rename to 16.0/apache/upgrade.exclude
diff --git a/16.0-rc/fpm-alpine/Dockerfile b/16.0/fpm-alpine/Dockerfile
similarity index 93%
rename from 16.0-rc/fpm-alpine/Dockerfile
rename to 16.0/fpm-alpine/Dockerfile
index e5c347b9..c5f2326e 100644
--- a/16.0-rc/fpm-alpine/Dockerfile
+++ b/16.0/fpm-alpine/Dockerfile
@@ -92,7 +92,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 16.0.0RC2
+ENV NEXTCLOUD_VERSION 16.0.0
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -101,9 +101,9 @@ RUN set -ex; \
     ; \
     \
     curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
+        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
+        "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 --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/16.0-rc/fpm-alpine/config/apcu.config.php b/16.0/fpm-alpine/config/apcu.config.php
similarity index 100%
rename from 16.0-rc/fpm-alpine/config/apcu.config.php
rename to 16.0/fpm-alpine/config/apcu.config.php
diff --git a/16.0-rc/fpm-alpine/config/apps.config.php b/16.0/fpm-alpine/config/apps.config.php
similarity index 100%
rename from 16.0-rc/fpm-alpine/config/apps.config.php
rename to 16.0/fpm-alpine/config/apps.config.php
diff --git a/16.0-rc/fpm-alpine/config/autoconfig.php b/16.0/fpm-alpine/config/autoconfig.php
similarity index 100%
rename from 16.0-rc/fpm-alpine/config/autoconfig.php
rename to 16.0/fpm-alpine/config/autoconfig.php
diff --git a/16.0-rc/fpm-alpine/config/redis.config.php b/16.0/fpm-alpine/config/redis.config.php
similarity index 100%
rename from 16.0-rc/fpm-alpine/config/redis.config.php
rename to 16.0/fpm-alpine/config/redis.config.php
diff --git a/16.0-rc/fpm-alpine/cron.sh b/16.0/fpm-alpine/cron.sh
similarity index 100%
rename from 16.0-rc/fpm-alpine/cron.sh
rename to 16.0/fpm-alpine/cron.sh
diff --git a/16.0-rc/fpm-alpine/entrypoint.sh b/16.0/fpm-alpine/entrypoint.sh
similarity index 100%
rename from 16.0-rc/fpm-alpine/entrypoint.sh
rename to 16.0/fpm-alpine/entrypoint.sh
diff --git a/16.0-rc/fpm-alpine/upgrade.exclude b/16.0/fpm-alpine/upgrade.exclude
similarity index 100%
rename from 16.0-rc/fpm-alpine/upgrade.exclude
rename to 16.0/fpm-alpine/upgrade.exclude
diff --git a/16.0-rc/fpm/Dockerfile b/16.0/fpm/Dockerfile
similarity index 94%
rename from 16.0-rc/fpm/Dockerfile
rename to 16.0/fpm/Dockerfile
index 765e8b19..840c74b0 100644
--- a/16.0-rc/fpm/Dockerfile
+++ b/16.0/fpm/Dockerfile
@@ -103,7 +103,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 16.0.0RC2
+ENV NEXTCLOUD_VERSION 16.0.0
 
 RUN set -ex; \
     fetchDeps=" \
@@ -114,9 +114,9 @@ RUN set -ex; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
     curl -fsSL -o nextcloud.tar.bz2 \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
+        "https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2"; \
     curl -fsSL -o nextcloud.tar.bz2.asc \
-        "https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2.asc"; \
+        "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 --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/16.0-rc/fpm/config/apcu.config.php b/16.0/fpm/config/apcu.config.php
similarity index 100%
rename from 16.0-rc/fpm/config/apcu.config.php
rename to 16.0/fpm/config/apcu.config.php
diff --git a/16.0-rc/fpm/config/apps.config.php b/16.0/fpm/config/apps.config.php
similarity index 100%
rename from 16.0-rc/fpm/config/apps.config.php
rename to 16.0/fpm/config/apps.config.php
diff --git a/16.0-rc/fpm/config/autoconfig.php b/16.0/fpm/config/autoconfig.php
similarity index 100%
rename from 16.0-rc/fpm/config/autoconfig.php
rename to 16.0/fpm/config/autoconfig.php
diff --git a/16.0-rc/fpm/config/redis.config.php b/16.0/fpm/config/redis.config.php
similarity index 100%
rename from 16.0-rc/fpm/config/redis.config.php
rename to 16.0/fpm/config/redis.config.php
diff --git a/16.0-rc/fpm/cron.sh b/16.0/fpm/cron.sh
similarity index 100%
rename from 16.0-rc/fpm/cron.sh
rename to 16.0/fpm/cron.sh
diff --git a/16.0-rc/fpm/entrypoint.sh b/16.0/fpm/entrypoint.sh
similarity index 100%
rename from 16.0-rc/fpm/entrypoint.sh
rename to 16.0/fpm/entrypoint.sh
diff --git a/16.0-rc/fpm/upgrade.exclude b/16.0/fpm/upgrade.exclude
similarity index 100%
rename from 16.0-rc/fpm/upgrade.exclude
rename to 16.0/fpm/upgrade.exclude