diff --git a/20.0/apache/Dockerfile b/20/apache/Dockerfile
similarity index 99%
rename from 20.0/apache/Dockerfile
rename to 20/apache/Dockerfile
index a7309bcb..9c0e0fe8 100644
--- a/20.0/apache/Dockerfile
+++ b/20/apache/Dockerfile
@@ -121,7 +121,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 20.0.11
+ENV NEXTCLOUD_VERSION 20.0.12
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/20.0/apache/config/apache-pretty-urls.config.php b/20/apache/config/apache-pretty-urls.config.php
similarity index 100%
rename from 20.0/apache/config/apache-pretty-urls.config.php
rename to 20/apache/config/apache-pretty-urls.config.php
diff --git a/20.0/apache/config/apcu.config.php b/20/apache/config/apcu.config.php
similarity index 100%
rename from 20.0/apache/config/apcu.config.php
rename to 20/apache/config/apcu.config.php
diff --git a/20.0/apache/config/apps.config.php b/20/apache/config/apps.config.php
similarity index 100%
rename from 20.0/apache/config/apps.config.php
rename to 20/apache/config/apps.config.php
diff --git a/20.0/apache/config/autoconfig.php b/20/apache/config/autoconfig.php
similarity index 100%
rename from 20.0/apache/config/autoconfig.php
rename to 20/apache/config/autoconfig.php
diff --git a/20.0/apache/config/redis.config.php b/20/apache/config/redis.config.php
similarity index 100%
rename from 20.0/apache/config/redis.config.php
rename to 20/apache/config/redis.config.php
diff --git a/20.0/apache/config/reverse-proxy.config.php b/20/apache/config/reverse-proxy.config.php
similarity index 100%
rename from 20.0/apache/config/reverse-proxy.config.php
rename to 20/apache/config/reverse-proxy.config.php
diff --git a/20.0/apache/config/s3.config.php b/20/apache/config/s3.config.php
similarity index 100%
rename from 20.0/apache/config/s3.config.php
rename to 20/apache/config/s3.config.php
diff --git a/20.0/apache/config/smtp.config.php b/20/apache/config/smtp.config.php
similarity index 100%
rename from 20.0/apache/config/smtp.config.php
rename to 20/apache/config/smtp.config.php
diff --git a/20.0/apache/config/swift.config.php b/20/apache/config/swift.config.php
similarity index 100%
rename from 20.0/apache/config/swift.config.php
rename to 20/apache/config/swift.config.php
diff --git a/20.0/apache/cron.sh b/20/apache/cron.sh
similarity index 100%
rename from 20.0/apache/cron.sh
rename to 20/apache/cron.sh
diff --git a/20.0/apache/entrypoint.sh b/20/apache/entrypoint.sh
similarity index 100%
rename from 20.0/apache/entrypoint.sh
rename to 20/apache/entrypoint.sh
diff --git a/20.0/apache/upgrade.exclude b/20/apache/upgrade.exclude
similarity index 100%
rename from 20.0/apache/upgrade.exclude
rename to 20/apache/upgrade.exclude
diff --git a/20.0/fpm-alpine/Dockerfile b/20/fpm-alpine/Dockerfile
similarity index 99%
rename from 20.0/fpm-alpine/Dockerfile
rename to 20/fpm-alpine/Dockerfile
index 9aa43a3a..b6c82636 100644
--- a/20.0/fpm-alpine/Dockerfile
+++ b/20/fpm-alpine/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.11
+ENV NEXTCLOUD_VERSION 20.0.12
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/20.0/fpm-alpine/config/apcu.config.php b/20/fpm-alpine/config/apcu.config.php
similarity index 100%
rename from 20.0/fpm-alpine/config/apcu.config.php
rename to 20/fpm-alpine/config/apcu.config.php
diff --git a/20.0/fpm-alpine/config/apps.config.php b/20/fpm-alpine/config/apps.config.php
similarity index 100%
rename from 20.0/fpm-alpine/config/apps.config.php
rename to 20/fpm-alpine/config/apps.config.php
diff --git a/20.0/fpm-alpine/config/autoconfig.php b/20/fpm-alpine/config/autoconfig.php
similarity index 100%
rename from 20.0/fpm-alpine/config/autoconfig.php
rename to 20/fpm-alpine/config/autoconfig.php
diff --git a/20.0/fpm-alpine/config/redis.config.php b/20/fpm-alpine/config/redis.config.php
similarity index 100%
rename from 20.0/fpm-alpine/config/redis.config.php
rename to 20/fpm-alpine/config/redis.config.php
diff --git a/20.0/fpm-alpine/config/reverse-proxy.config.php b/20/fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from 20.0/fpm-alpine/config/reverse-proxy.config.php
rename to 20/fpm-alpine/config/reverse-proxy.config.php
diff --git a/20.0/fpm-alpine/config/s3.config.php b/20/fpm-alpine/config/s3.config.php
similarity index 100%
rename from 20.0/fpm-alpine/config/s3.config.php
rename to 20/fpm-alpine/config/s3.config.php
diff --git a/20.0/fpm-alpine/config/smtp.config.php b/20/fpm-alpine/config/smtp.config.php
similarity index 100%
rename from 20.0/fpm-alpine/config/smtp.config.php
rename to 20/fpm-alpine/config/smtp.config.php
diff --git a/20.0/fpm-alpine/config/swift.config.php b/20/fpm-alpine/config/swift.config.php
similarity index 100%
rename from 20.0/fpm-alpine/config/swift.config.php
rename to 20/fpm-alpine/config/swift.config.php
diff --git a/20.0/fpm-alpine/cron.sh b/20/fpm-alpine/cron.sh
similarity index 100%
rename from 20.0/fpm-alpine/cron.sh
rename to 20/fpm-alpine/cron.sh
diff --git a/20.0/fpm-alpine/entrypoint.sh b/20/fpm-alpine/entrypoint.sh
similarity index 100%
rename from 20.0/fpm-alpine/entrypoint.sh
rename to 20/fpm-alpine/entrypoint.sh
diff --git a/20.0/fpm-alpine/upgrade.exclude b/20/fpm-alpine/upgrade.exclude
similarity index 100%
rename from 20.0/fpm-alpine/upgrade.exclude
rename to 20/fpm-alpine/upgrade.exclude
diff --git a/20.0/fpm/Dockerfile b/20/fpm/Dockerfile
similarity index 99%
rename from 20.0/fpm/Dockerfile
rename to 20/fpm/Dockerfile
index 18f4d104..7dc76d16 100644
--- a/20.0/fpm/Dockerfile
+++ b/20/fpm/Dockerfile
@@ -113,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 20.0.11
+ENV NEXTCLOUD_VERSION 20.0.12
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/20.0/fpm/config/apcu.config.php b/20/fpm/config/apcu.config.php
similarity index 100%
rename from 20.0/fpm/config/apcu.config.php
rename to 20/fpm/config/apcu.config.php
diff --git a/20.0/fpm/config/apps.config.php b/20/fpm/config/apps.config.php
similarity index 100%
rename from 20.0/fpm/config/apps.config.php
rename to 20/fpm/config/apps.config.php
diff --git a/20.0/fpm/config/autoconfig.php b/20/fpm/config/autoconfig.php
similarity index 100%
rename from 20.0/fpm/config/autoconfig.php
rename to 20/fpm/config/autoconfig.php
diff --git a/20.0/fpm/config/redis.config.php b/20/fpm/config/redis.config.php
similarity index 100%
rename from 20.0/fpm/config/redis.config.php
rename to 20/fpm/config/redis.config.php
diff --git a/20.0/fpm/config/reverse-proxy.config.php b/20/fpm/config/reverse-proxy.config.php
similarity index 100%
rename from 20.0/fpm/config/reverse-proxy.config.php
rename to 20/fpm/config/reverse-proxy.config.php
diff --git a/20.0/fpm/config/s3.config.php b/20/fpm/config/s3.config.php
similarity index 100%
rename from 20.0/fpm/config/s3.config.php
rename to 20/fpm/config/s3.config.php
diff --git a/20.0/fpm/config/smtp.config.php b/20/fpm/config/smtp.config.php
similarity index 100%
rename from 20.0/fpm/config/smtp.config.php
rename to 20/fpm/config/smtp.config.php
diff --git a/20.0/fpm/config/swift.config.php b/20/fpm/config/swift.config.php
similarity index 100%
rename from 20.0/fpm/config/swift.config.php
rename to 20/fpm/config/swift.config.php
diff --git a/20.0/fpm/cron.sh b/20/fpm/cron.sh
similarity index 100%
rename from 20.0/fpm/cron.sh
rename to 20/fpm/cron.sh
diff --git a/20.0/fpm/entrypoint.sh b/20/fpm/entrypoint.sh
similarity index 100%
rename from 20.0/fpm/entrypoint.sh
rename to 20/fpm/entrypoint.sh
diff --git a/20.0/fpm/upgrade.exclude b/20/fpm/upgrade.exclude
similarity index 100%
rename from 20.0/fpm/upgrade.exclude
rename to 20/fpm/upgrade.exclude
diff --git a/22.0/apache/Dockerfile b/21/apache/Dockerfile
similarity index 99%
rename from 22.0/apache/Dockerfile
rename to 21/apache/Dockerfile
index 9ff37211..cf83e47a 100644
--- a/22.0/apache/Dockerfile
+++ b/21/apache/Dockerfile
@@ -121,7 +121,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 22.0.0
+ENV NEXTCLOUD_VERSION 21.0.4
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/21.0/apache/config/apache-pretty-urls.config.php b/21/apache/config/apache-pretty-urls.config.php
similarity index 100%
rename from 21.0/apache/config/apache-pretty-urls.config.php
rename to 21/apache/config/apache-pretty-urls.config.php
diff --git a/21.0/apache/config/apcu.config.php b/21/apache/config/apcu.config.php
similarity index 100%
rename from 21.0/apache/config/apcu.config.php
rename to 21/apache/config/apcu.config.php
diff --git a/21.0/apache/config/apps.config.php b/21/apache/config/apps.config.php
similarity index 100%
rename from 21.0/apache/config/apps.config.php
rename to 21/apache/config/apps.config.php
diff --git a/21.0/apache/config/autoconfig.php b/21/apache/config/autoconfig.php
similarity index 100%
rename from 21.0/apache/config/autoconfig.php
rename to 21/apache/config/autoconfig.php
diff --git a/21.0/apache/config/redis.config.php b/21/apache/config/redis.config.php
similarity index 100%
rename from 21.0/apache/config/redis.config.php
rename to 21/apache/config/redis.config.php
diff --git a/21.0/apache/config/reverse-proxy.config.php b/21/apache/config/reverse-proxy.config.php
similarity index 100%
rename from 21.0/apache/config/reverse-proxy.config.php
rename to 21/apache/config/reverse-proxy.config.php
diff --git a/21.0/apache/config/s3.config.php b/21/apache/config/s3.config.php
similarity index 100%
rename from 21.0/apache/config/s3.config.php
rename to 21/apache/config/s3.config.php
diff --git a/21.0/apache/config/smtp.config.php b/21/apache/config/smtp.config.php
similarity index 100%
rename from 21.0/apache/config/smtp.config.php
rename to 21/apache/config/smtp.config.php
diff --git a/21.0/apache/config/swift.config.php b/21/apache/config/swift.config.php
similarity index 100%
rename from 21.0/apache/config/swift.config.php
rename to 21/apache/config/swift.config.php
diff --git a/21.0/apache/cron.sh b/21/apache/cron.sh
similarity index 100%
rename from 21.0/apache/cron.sh
rename to 21/apache/cron.sh
diff --git a/21.0/apache/entrypoint.sh b/21/apache/entrypoint.sh
similarity index 100%
rename from 21.0/apache/entrypoint.sh
rename to 21/apache/entrypoint.sh
diff --git a/21.0/apache/upgrade.exclude b/21/apache/upgrade.exclude
similarity index 100%
rename from 21.0/apache/upgrade.exclude
rename to 21/apache/upgrade.exclude
diff --git a/21.0/fpm-alpine/Dockerfile b/21/fpm-alpine/Dockerfile
similarity index 99%
rename from 21.0/fpm-alpine/Dockerfile
rename to 21/fpm-alpine/Dockerfile
index 4234a678..a0a359e1 100644
--- a/21.0/fpm-alpine/Dockerfile
+++ b/21/fpm-alpine/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.3
+ENV NEXTCLOUD_VERSION 21.0.4
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/21.0/fpm-alpine/config/apcu.config.php b/21/fpm-alpine/config/apcu.config.php
similarity index 100%
rename from 21.0/fpm-alpine/config/apcu.config.php
rename to 21/fpm-alpine/config/apcu.config.php
diff --git a/21.0/fpm-alpine/config/apps.config.php b/21/fpm-alpine/config/apps.config.php
similarity index 100%
rename from 21.0/fpm-alpine/config/apps.config.php
rename to 21/fpm-alpine/config/apps.config.php
diff --git a/21.0/fpm-alpine/config/autoconfig.php b/21/fpm-alpine/config/autoconfig.php
similarity index 100%
rename from 21.0/fpm-alpine/config/autoconfig.php
rename to 21/fpm-alpine/config/autoconfig.php
diff --git a/21.0/fpm-alpine/config/redis.config.php b/21/fpm-alpine/config/redis.config.php
similarity index 100%
rename from 21.0/fpm-alpine/config/redis.config.php
rename to 21/fpm-alpine/config/redis.config.php
diff --git a/21.0/fpm-alpine/config/reverse-proxy.config.php b/21/fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from 21.0/fpm-alpine/config/reverse-proxy.config.php
rename to 21/fpm-alpine/config/reverse-proxy.config.php
diff --git a/21.0/fpm-alpine/config/s3.config.php b/21/fpm-alpine/config/s3.config.php
similarity index 100%
rename from 21.0/fpm-alpine/config/s3.config.php
rename to 21/fpm-alpine/config/s3.config.php
diff --git a/21.0/fpm-alpine/config/smtp.config.php b/21/fpm-alpine/config/smtp.config.php
similarity index 100%
rename from 21.0/fpm-alpine/config/smtp.config.php
rename to 21/fpm-alpine/config/smtp.config.php
diff --git a/21.0/fpm-alpine/config/swift.config.php b/21/fpm-alpine/config/swift.config.php
similarity index 100%
rename from 21.0/fpm-alpine/config/swift.config.php
rename to 21/fpm-alpine/config/swift.config.php
diff --git a/21.0/fpm-alpine/cron.sh b/21/fpm-alpine/cron.sh
similarity index 100%
rename from 21.0/fpm-alpine/cron.sh
rename to 21/fpm-alpine/cron.sh
diff --git a/21.0/fpm-alpine/entrypoint.sh b/21/fpm-alpine/entrypoint.sh
similarity index 100%
rename from 21.0/fpm-alpine/entrypoint.sh
rename to 21/fpm-alpine/entrypoint.sh
diff --git a/21.0/fpm-alpine/upgrade.exclude b/21/fpm-alpine/upgrade.exclude
similarity index 100%
rename from 21.0/fpm-alpine/upgrade.exclude
rename to 21/fpm-alpine/upgrade.exclude
diff --git a/22.0/fpm/Dockerfile b/21/fpm/Dockerfile
similarity index 99%
rename from 22.0/fpm/Dockerfile
rename to 21/fpm/Dockerfile
index 0b29a341..83498f83 100644
--- a/22.0/fpm/Dockerfile
+++ b/21/fpm/Dockerfile
@@ -113,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 22.0.0
+ENV NEXTCLOUD_VERSION 21.0.4
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/21.0/fpm/config/apcu.config.php b/21/fpm/config/apcu.config.php
similarity index 100%
rename from 21.0/fpm/config/apcu.config.php
rename to 21/fpm/config/apcu.config.php
diff --git a/21.0/fpm/config/apps.config.php b/21/fpm/config/apps.config.php
similarity index 100%
rename from 21.0/fpm/config/apps.config.php
rename to 21/fpm/config/apps.config.php
diff --git a/21.0/fpm/config/autoconfig.php b/21/fpm/config/autoconfig.php
similarity index 100%
rename from 21.0/fpm/config/autoconfig.php
rename to 21/fpm/config/autoconfig.php
diff --git a/21.0/fpm/config/redis.config.php b/21/fpm/config/redis.config.php
similarity index 100%
rename from 21.0/fpm/config/redis.config.php
rename to 21/fpm/config/redis.config.php
diff --git a/21.0/fpm/config/reverse-proxy.config.php b/21/fpm/config/reverse-proxy.config.php
similarity index 100%
rename from 21.0/fpm/config/reverse-proxy.config.php
rename to 21/fpm/config/reverse-proxy.config.php
diff --git a/21.0/fpm/config/s3.config.php b/21/fpm/config/s3.config.php
similarity index 100%
rename from 21.0/fpm/config/s3.config.php
rename to 21/fpm/config/s3.config.php
diff --git a/21.0/fpm/config/smtp.config.php b/21/fpm/config/smtp.config.php
similarity index 100%
rename from 21.0/fpm/config/smtp.config.php
rename to 21/fpm/config/smtp.config.php
diff --git a/21.0/fpm/config/swift.config.php b/21/fpm/config/swift.config.php
similarity index 100%
rename from 21.0/fpm/config/swift.config.php
rename to 21/fpm/config/swift.config.php
diff --git a/21.0/fpm/cron.sh b/21/fpm/cron.sh
similarity index 100%
rename from 21.0/fpm/cron.sh
rename to 21/fpm/cron.sh
diff --git a/21.0/fpm/entrypoint.sh b/21/fpm/entrypoint.sh
similarity index 100%
rename from 21.0/fpm/entrypoint.sh
rename to 21/fpm/entrypoint.sh
diff --git a/21.0/fpm/upgrade.exclude b/21/fpm/upgrade.exclude
similarity index 100%
rename from 21.0/fpm/upgrade.exclude
rename to 21/fpm/upgrade.exclude
diff --git a/21.0/apache/Dockerfile b/22/apache/Dockerfile
similarity index 99%
rename from 21.0/apache/Dockerfile
rename to 22/apache/Dockerfile
index 1b95a920..725918bb 100644
--- a/21.0/apache/Dockerfile
+++ b/22/apache/Dockerfile
@@ -121,7 +121,7 @@ RUN a2enmod headers rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 21.0.3
+ENV NEXTCLOUD_VERSION 22.1.0
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/22.0/apache/config/apache-pretty-urls.config.php b/22/apache/config/apache-pretty-urls.config.php
similarity index 100%
rename from 22.0/apache/config/apache-pretty-urls.config.php
rename to 22/apache/config/apache-pretty-urls.config.php
diff --git a/22.0/apache/config/apcu.config.php b/22/apache/config/apcu.config.php
similarity index 100%
rename from 22.0/apache/config/apcu.config.php
rename to 22/apache/config/apcu.config.php
diff --git a/22.0/apache/config/apps.config.php b/22/apache/config/apps.config.php
similarity index 100%
rename from 22.0/apache/config/apps.config.php
rename to 22/apache/config/apps.config.php
diff --git a/22.0/apache/config/autoconfig.php b/22/apache/config/autoconfig.php
similarity index 100%
rename from 22.0/apache/config/autoconfig.php
rename to 22/apache/config/autoconfig.php
diff --git a/22.0/apache/config/redis.config.php b/22/apache/config/redis.config.php
similarity index 100%
rename from 22.0/apache/config/redis.config.php
rename to 22/apache/config/redis.config.php
diff --git a/22.0/apache/config/reverse-proxy.config.php b/22/apache/config/reverse-proxy.config.php
similarity index 100%
rename from 22.0/apache/config/reverse-proxy.config.php
rename to 22/apache/config/reverse-proxy.config.php
diff --git a/22.0/apache/config/s3.config.php b/22/apache/config/s3.config.php
similarity index 100%
rename from 22.0/apache/config/s3.config.php
rename to 22/apache/config/s3.config.php
diff --git a/22.0/apache/config/smtp.config.php b/22/apache/config/smtp.config.php
similarity index 100%
rename from 22.0/apache/config/smtp.config.php
rename to 22/apache/config/smtp.config.php
diff --git a/22.0/apache/config/swift.config.php b/22/apache/config/swift.config.php
similarity index 100%
rename from 22.0/apache/config/swift.config.php
rename to 22/apache/config/swift.config.php
diff --git a/22.0/apache/cron.sh b/22/apache/cron.sh
similarity index 100%
rename from 22.0/apache/cron.sh
rename to 22/apache/cron.sh
diff --git a/22.0/apache/entrypoint.sh b/22/apache/entrypoint.sh
similarity index 100%
rename from 22.0/apache/entrypoint.sh
rename to 22/apache/entrypoint.sh
diff --git a/22.0/apache/upgrade.exclude b/22/apache/upgrade.exclude
similarity index 100%
rename from 22.0/apache/upgrade.exclude
rename to 22/apache/upgrade.exclude
diff --git a/22.0/fpm-alpine/Dockerfile b/22/fpm-alpine/Dockerfile
similarity index 99%
rename from 22.0/fpm-alpine/Dockerfile
rename to 22/fpm-alpine/Dockerfile
index 3b446279..0712ec27 100644
--- a/22.0/fpm-alpine/Dockerfile
+++ b/22/fpm-alpine/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 22.0.0
+ENV NEXTCLOUD_VERSION 22.1.0
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/22.0/fpm-alpine/config/apcu.config.php b/22/fpm-alpine/config/apcu.config.php
similarity index 100%
rename from 22.0/fpm-alpine/config/apcu.config.php
rename to 22/fpm-alpine/config/apcu.config.php
diff --git a/22.0/fpm-alpine/config/apps.config.php b/22/fpm-alpine/config/apps.config.php
similarity index 100%
rename from 22.0/fpm-alpine/config/apps.config.php
rename to 22/fpm-alpine/config/apps.config.php
diff --git a/22.0/fpm-alpine/config/autoconfig.php b/22/fpm-alpine/config/autoconfig.php
similarity index 100%
rename from 22.0/fpm-alpine/config/autoconfig.php
rename to 22/fpm-alpine/config/autoconfig.php
diff --git a/22.0/fpm-alpine/config/redis.config.php b/22/fpm-alpine/config/redis.config.php
similarity index 100%
rename from 22.0/fpm-alpine/config/redis.config.php
rename to 22/fpm-alpine/config/redis.config.php
diff --git a/22.0/fpm-alpine/config/reverse-proxy.config.php b/22/fpm-alpine/config/reverse-proxy.config.php
similarity index 100%
rename from 22.0/fpm-alpine/config/reverse-proxy.config.php
rename to 22/fpm-alpine/config/reverse-proxy.config.php
diff --git a/22.0/fpm-alpine/config/s3.config.php b/22/fpm-alpine/config/s3.config.php
similarity index 100%
rename from 22.0/fpm-alpine/config/s3.config.php
rename to 22/fpm-alpine/config/s3.config.php
diff --git a/22.0/fpm-alpine/config/smtp.config.php b/22/fpm-alpine/config/smtp.config.php
similarity index 100%
rename from 22.0/fpm-alpine/config/smtp.config.php
rename to 22/fpm-alpine/config/smtp.config.php
diff --git a/22.0/fpm-alpine/config/swift.config.php b/22/fpm-alpine/config/swift.config.php
similarity index 100%
rename from 22.0/fpm-alpine/config/swift.config.php
rename to 22/fpm-alpine/config/swift.config.php
diff --git a/22.0/fpm-alpine/cron.sh b/22/fpm-alpine/cron.sh
similarity index 100%
rename from 22.0/fpm-alpine/cron.sh
rename to 22/fpm-alpine/cron.sh
diff --git a/22.0/fpm-alpine/entrypoint.sh b/22/fpm-alpine/entrypoint.sh
similarity index 100%
rename from 22.0/fpm-alpine/entrypoint.sh
rename to 22/fpm-alpine/entrypoint.sh
diff --git a/22.0/fpm-alpine/upgrade.exclude b/22/fpm-alpine/upgrade.exclude
similarity index 100%
rename from 22.0/fpm-alpine/upgrade.exclude
rename to 22/fpm-alpine/upgrade.exclude
diff --git a/21.0/fpm/Dockerfile b/22/fpm/Dockerfile
similarity index 99%
rename from 21.0/fpm/Dockerfile
rename to 22/fpm/Dockerfile
index c8e25cd4..9c1354ba 100644
--- a/21.0/fpm/Dockerfile
+++ b/22/fpm/Dockerfile
@@ -113,7 +113,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 21.0.3
+ENV NEXTCLOUD_VERSION 22.1.0
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/22.0/fpm/config/apcu.config.php b/22/fpm/config/apcu.config.php
similarity index 100%
rename from 22.0/fpm/config/apcu.config.php
rename to 22/fpm/config/apcu.config.php
diff --git a/22.0/fpm/config/apps.config.php b/22/fpm/config/apps.config.php
similarity index 100%
rename from 22.0/fpm/config/apps.config.php
rename to 22/fpm/config/apps.config.php
diff --git a/22.0/fpm/config/autoconfig.php b/22/fpm/config/autoconfig.php
similarity index 100%
rename from 22.0/fpm/config/autoconfig.php
rename to 22/fpm/config/autoconfig.php
diff --git a/22.0/fpm/config/redis.config.php b/22/fpm/config/redis.config.php
similarity index 100%
rename from 22.0/fpm/config/redis.config.php
rename to 22/fpm/config/redis.config.php
diff --git a/22.0/fpm/config/reverse-proxy.config.php b/22/fpm/config/reverse-proxy.config.php
similarity index 100%
rename from 22.0/fpm/config/reverse-proxy.config.php
rename to 22/fpm/config/reverse-proxy.config.php
diff --git a/22.0/fpm/config/s3.config.php b/22/fpm/config/s3.config.php
similarity index 100%
rename from 22.0/fpm/config/s3.config.php
rename to 22/fpm/config/s3.config.php
diff --git a/22.0/fpm/config/smtp.config.php b/22/fpm/config/smtp.config.php
similarity index 100%
rename from 22.0/fpm/config/smtp.config.php
rename to 22/fpm/config/smtp.config.php
diff --git a/22.0/fpm/config/swift.config.php b/22/fpm/config/swift.config.php
similarity index 100%
rename from 22.0/fpm/config/swift.config.php
rename to 22/fpm/config/swift.config.php
diff --git a/22.0/fpm/cron.sh b/22/fpm/cron.sh
similarity index 100%
rename from 22.0/fpm/cron.sh
rename to 22/fpm/cron.sh
diff --git a/22.0/fpm/entrypoint.sh b/22/fpm/entrypoint.sh
similarity index 100%
rename from 22.0/fpm/entrypoint.sh
rename to 22/fpm/entrypoint.sh
diff --git a/22.0/fpm/upgrade.exclude b/22/fpm/upgrade.exclude
similarity index 100%
rename from 22.0/fpm/upgrade.exclude
rename to 22/fpm/upgrade.exclude
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 68779809..337d5740 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -Eeuo pipefail
 
-stable_channel='21.0.3'
+stable_channel='21.0.4'
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
diff --git a/latest.txt b/latest.txt
index 1d975bef..ee5c2446 100644
--- a/latest.txt
+++ b/latest.txt
@@ -1 +1 @@
-22.0.0
+22.1.0
diff --git a/update.sh b/update.sh
index f2382f2f..07c32624 100755
--- a/update.sh
+++ b/update.sh
@@ -76,7 +76,7 @@ variants=(
 	fpm-alpine
 )
 
-min_version='20.0'
+min_version='20'
 
 # version_greater_or_equal A B returns whether A >= B
 function version_greater_or_equal() {
@@ -155,7 +155,7 @@ fullversions=( $( curl -fsSL 'https://download.nextcloud.com/server/releases/' |
 	grep -oE 'nextcloud-[[:digit:]]+(\.[[:digit:]]+){2}' | \
 	grep -oE '[[:digit:]]+(\.[[:digit:]]+){2}' | \
 	sort -urV ) )
-versions=( $( printf '%s\n' "${fullversions[@]}" | cut -d. -f1-2 | sort -urV ) )
+versions=( $( printf '%s\n' "${fullversions[@]}" | cut -d. -f1 | sort -urV ) )
 for version in "${versions[@]}"; do
 	fullversion="$( printf '%s\n' "${fullversions[@]}" | grep -E "^$version" | head -1 )"