diff --git a/21.0-beta/apache/Dockerfile b/21.0-rc/apache/Dockerfile
similarity index 99%
rename from 21.0-beta/apache/Dockerfile
rename to 21.0-rc/apache/Dockerfile
index 4151272c..377527ae 100644
--- a/21.0-beta/apache/Dockerfile
+++ b/21.0-rc/apache/Dockerfile
@@ -114,7 +114,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 21.0.0beta8
+ENV NEXTCLOUD_VERSION 21.0.0RC1
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/21.0-beta/apache/config/apache-pretty-urls.config.php b/21.0-rc/apache/config/apache-pretty-urls.config.php
similarity index 100%
rename from 21.0-beta/apache/config/apache-pretty-urls.config.php
rename to 21.0-rc/apache/config/apache-pretty-urls.config.php
diff --git a/21.0-beta/apache/config/apcu.config.php b/21.0-rc/apache/config/apcu.config.php
similarity index 100%
rename from 21.0-beta/apache/config/apcu.config.php
rename to 21.0-rc/apache/config/apcu.config.php
diff --git a/21.0-beta/apache/config/apps.config.php b/21.0-rc/apache/config/apps.config.php
similarity index 100%
rename from 21.0-beta/apache/config/apps.config.php
rename to 21.0-rc/apache/config/apps.config.php
diff --git a/21.0-beta/apache/config/autoconfig.php b/21.0-rc/apache/config/autoconfig.php
similarity index 100%
rename from 21.0-beta/apache/config/autoconfig.php
rename to 21.0-rc/apache/config/autoconfig.php
diff --git a/21.0-beta/apache/config/redis.config.php b/21.0-rc/apache/config/redis.config.php
similarity index 100%
rename from 21.0-beta/apache/config/redis.config.php
rename to 21.0-rc/apache/config/redis.config.php
diff --git a/21.0-beta/apache/config/reverse-proxy.config.php b/21.0-rc/apache/config/reverse-proxy.config.php
similarity index 100%
rename from 21.0-beta/apache/config/reverse-proxy.config.php
rename to 21.0-rc/apache/config/reverse-proxy.config.php
diff --git a/21.0-beta/apache/config/s3.config.php b/21.0-rc/apache/config/s3.config.php
similarity index 100%
rename from 21.0-beta/apache/config/s3.config.php
rename to 21.0-rc/apache/config/s3.config.php
diff --git a/21.0-beta/apache/config/smtp.config.php b/21.0-rc/apache/config/smtp.config.php
similarity index 100%
rename from 21.0-beta/apache/config/smtp.config.php
rename to 21.0-rc/apache/config/smtp.config.php
diff --git a/21.0-beta/apache/config/swift.config.php b/21.0-rc/apache/config/swift.config.php
similarity index 100%
rename from 21.0-beta/apache/config/swift.config.php
rename to 21.0-rc/apache/config/swift.config.php
diff --git a/21.0-beta/apache/cron.sh b/21.0-rc/apache/cron.sh
similarity index 100%
rename from 21.0-beta/apache/cron.sh
rename to 21.0-rc/apache/cron.sh
diff --git a/21.0-beta/apache/entrypoint.sh b/21.0-rc/apache/entrypoint.sh
similarity index 100%
rename from 21.0-beta/apache/entrypoint.sh
rename to 21.0-rc/apache/entrypoint.sh
diff --git a/21.0-beta/apache/upgrade.exclude b/21.0-rc/apache/upgrade.exclude
similarity index 100%
rename from 21.0-beta/apache/upgrade.exclude
rename to 21.0-rc/apache/upgrade.exclude
diff --git a/21.0-beta/fpm-alpine/Dockerfile b/21.0-rc/fpm-alpine/Dockerfile
similarity index 99%
rename from 21.0-beta/fpm-alpine/Dockerfile
rename to 21.0-rc/fpm-alpine/Dockerfile
index c87d03b2..7d1b8839 100644
--- a/21.0-beta/fpm-alpine/Dockerfile
+++ b/21.0-rc/fpm-alpine/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.0beta8
+ENV NEXTCLOUD_VERSION 21.0.0RC1
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/21.0-beta/fpm-alpine/config/apcu.config.php b/21.0-rc/fpm-alpine/config/apcu.config.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/apcu.config.php
rename to 21.0-rc/fpm-alpine/config/apcu.config.php
diff --git a/21.0-beta/fpm-alpine/config/apps.config.php b/21.0-rc/fpm-alpine/config/apps.config.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/apps.config.php
rename to 21.0-rc/fpm-alpine/config/apps.config.php
diff --git a/21.0-beta/fpm-alpine/config/autoconfig.php b/21.0-rc/fpm-alpine/config/autoconfig.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/autoconfig.php
rename to 21.0-rc/fpm-alpine/config/autoconfig.php
diff --git a/21.0-beta/fpm-alpine/config/redis.config.php b/21.0-rc/fpm-alpine/config/redis.config.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/redis.config.php
rename to 21.0-rc/fpm-alpine/config/redis.config.php
diff --git a/21.0-beta/fpm-alpine/config/reverse-proxy.config.php b/21.0-rc/fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/reverse-proxy.config.php
rename to 21.0-rc/fpm-alpine/config/reverse-proxy.config.php
diff --git a/21.0-beta/fpm-alpine/config/s3.config.php b/21.0-rc/fpm-alpine/config/s3.config.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/s3.config.php
rename to 21.0-rc/fpm-alpine/config/s3.config.php
diff --git a/21.0-beta/fpm-alpine/config/smtp.config.php b/21.0-rc/fpm-alpine/config/smtp.config.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/smtp.config.php
rename to 21.0-rc/fpm-alpine/config/smtp.config.php
diff --git a/21.0-beta/fpm-alpine/config/swift.config.php b/21.0-rc/fpm-alpine/config/swift.config.php
similarity index 100%
rename from 21.0-beta/fpm-alpine/config/swift.config.php
rename to 21.0-rc/fpm-alpine/config/swift.config.php
diff --git a/21.0-beta/fpm-alpine/cron.sh b/21.0-rc/fpm-alpine/cron.sh
similarity index 100%
rename from 21.0-beta/fpm-alpine/cron.sh
rename to 21.0-rc/fpm-alpine/cron.sh
diff --git a/21.0-beta/fpm-alpine/entrypoint.sh b/21.0-rc/fpm-alpine/entrypoint.sh
similarity index 100%
rename from 21.0-beta/fpm-alpine/entrypoint.sh
rename to 21.0-rc/fpm-alpine/entrypoint.sh
diff --git a/21.0-beta/fpm-alpine/upgrade.exclude b/21.0-rc/fpm-alpine/upgrade.exclude
similarity index 100%
rename from 21.0-beta/fpm-alpine/upgrade.exclude
rename to 21.0-rc/fpm-alpine/upgrade.exclude
diff --git a/21.0-beta/fpm/Dockerfile b/21.0-rc/fpm/Dockerfile
similarity index 99%
rename from 21.0-beta/fpm/Dockerfile
rename to 21.0-rc/fpm/Dockerfile
index 639ad1cf..db48622d 100644
--- a/21.0-beta/fpm/Dockerfile
+++ b/21.0-rc/fpm/Dockerfile
@@ -106,7 +106,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.0beta8
+ENV NEXTCLOUD_VERSION 21.0.0RC1
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/21.0-beta/fpm/config/apcu.config.php b/21.0-rc/fpm/config/apcu.config.php
similarity index 100%
rename from 21.0-beta/fpm/config/apcu.config.php
rename to 21.0-rc/fpm/config/apcu.config.php
diff --git a/21.0-beta/fpm/config/apps.config.php b/21.0-rc/fpm/config/apps.config.php
similarity index 100%
rename from 21.0-beta/fpm/config/apps.config.php
rename to 21.0-rc/fpm/config/apps.config.php
diff --git a/21.0-beta/fpm/config/autoconfig.php b/21.0-rc/fpm/config/autoconfig.php
similarity index 100%
rename from 21.0-beta/fpm/config/autoconfig.php
rename to 21.0-rc/fpm/config/autoconfig.php
diff --git a/21.0-beta/fpm/config/redis.config.php b/21.0-rc/fpm/config/redis.config.php
similarity index 100%
rename from 21.0-beta/fpm/config/redis.config.php
rename to 21.0-rc/fpm/config/redis.config.php
diff --git a/21.0-beta/fpm/config/reverse-proxy.config.php b/21.0-rc/fpm/config/reverse-proxy.config.php
similarity index 100%
rename from 21.0-beta/fpm/config/reverse-proxy.config.php
rename to 21.0-rc/fpm/config/reverse-proxy.config.php
diff --git a/21.0-beta/fpm/config/s3.config.php b/21.0-rc/fpm/config/s3.config.php
similarity index 100%
rename from 21.0-beta/fpm/config/s3.config.php
rename to 21.0-rc/fpm/config/s3.config.php
diff --git a/21.0-beta/fpm/config/smtp.config.php b/21.0-rc/fpm/config/smtp.config.php
similarity index 100%
rename from 21.0-beta/fpm/config/smtp.config.php
rename to 21.0-rc/fpm/config/smtp.config.php
diff --git a/21.0-beta/fpm/config/swift.config.php b/21.0-rc/fpm/config/swift.config.php
similarity index 100%
rename from 21.0-beta/fpm/config/swift.config.php
rename to 21.0-rc/fpm/config/swift.config.php
diff --git a/21.0-beta/fpm/cron.sh b/21.0-rc/fpm/cron.sh
similarity index 100%
rename from 21.0-beta/fpm/cron.sh
rename to 21.0-rc/fpm/cron.sh
diff --git a/21.0-beta/fpm/entrypoint.sh b/21.0-rc/fpm/entrypoint.sh
similarity index 100%
rename from 21.0-beta/fpm/entrypoint.sh
rename to 21.0-rc/fpm/entrypoint.sh
diff --git a/21.0-beta/fpm/upgrade.exclude b/21.0-rc/fpm/upgrade.exclude
similarity index 100%
rename from 21.0-beta/fpm/upgrade.exclude
rename to 21.0-rc/fpm/upgrade.exclude