diff --git a/README.md b/README.md
index 4a13758..dad386b 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ this kit:
 | 6.x                 | 1.16-1.22+                        | 19.x              | Shell scripts and templates |
 | 7.x                 | 1.16-1.22+                        | 20.x              | Kustomize and Rigger        |
 | 8.x                 | 1.16-1.22+                        | 21.x              | Kustomize and Rigger        |
+| 9.x                 | 1.16-1.22+                        | 22.x              | Kustomize and Rigger        |
 
 ### Switching from "Shell Script" Deployment to "Kustomize" Deployment
 If you are running version 1.x through 6.x of this kit and are now upgrading to
diff --git a/docker/backend-nextcloud-apache/Dockerfile b/docker/backend-nextcloud-apache/Dockerfile
index 97536e2..4579653 100644
--- a/docker/backend-nextcloud-apache/Dockerfile
+++ b/docker/backend-nextcloud-apache/Dockerfile
@@ -8,7 +8,7 @@
 # @copyright Copyright (c) 2019, Inveniem
 # @license GNU AGPL version 3 or any later version
 #
-FROM nextcloud:21.0.9-apache
+FROM nextcloud:22.2.5-apache
 
 ENV NEXTCLOUD_CONFIG_READ_ONLY "false"
 
diff --git a/docker/backend-nextcloud-fpm/Dockerfile b/docker/backend-nextcloud-fpm/Dockerfile
index 4162918..bf138ff 100644
--- a/docker/backend-nextcloud-fpm/Dockerfile
+++ b/docker/backend-nextcloud-fpm/Dockerfile
@@ -57,7 +57,7 @@ RUN set -eux;\
 ################################################################################
 # This is the container that actually gets pushed.
 #
-FROM nextcloud:21.0.9-fpm-alpine
+FROM nextcloud:22.2.5-fpm-alpine
 
 ENV NEXTCLOUD_CONFIG_READ_ONLY "false"
 
diff --git a/docker/nextcloud-cron/Dockerfile b/docker/nextcloud-cron/Dockerfile
index 9ca6235..0aedbe6 100644
--- a/docker/nextcloud-cron/Dockerfile
+++ b/docker/nextcloud-cron/Dockerfile
@@ -7,7 +7,7 @@
 # @copyright Copyright (c) 2019-2020, Inveniem
 # @license GNU AGPL version 3 or any later version
 #
-FROM nextcloud:21.0.9-fpm
+FROM nextcloud:22.2.5-fpm
 
 ENV NEXTCLOUD_CONFIG_READ_ONLY "true"
 
diff --git a/overlays/00-sample/kustomization.yaml b/overlays/00-sample/kustomization.yaml
index 7744293..66728e0 100644
--- a/overlays/00-sample/kustomization.yaml
+++ b/overlays/00-sample/kustomization.yaml
@@ -96,20 +96,20 @@ images:
 
   - name: inveniem/nextcloud-cron
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-cron
-    newTag: "8.0.0"
+    newTag: "9.0.0"
 
   - name: inveniem/nextcloud-apache
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-apache
-    newTag: "8.0.0"
+    newTag: "9.0.0"
 
   - name: inveniem/nextcloud-fpm
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-fpm
-    newTag: "8.0.0"
+    newTag: "9.0.0"
 
   - name: inveniem/nextcloud-nginx-middleware
     newName: your-acr-instance.azurecr.io/inveniem/nextcloud-nginx-middleware
-    newTag: "8.0.0"
+    newTag: "9.0.0"
 
   - name: inveniem/sftp-ws-server
     newName: your-acr-instance.azurecr.io/inveniem/sftp-ws-server
-    newTag: "8.0.0"
+    newTag: "9.0.0"
diff --git a/overlays/00-sample/publish.profile b/overlays/00-sample/publish.profile
index af94316..d403f19 100644
--- a/overlays/00-sample/publish.profile
+++ b/overlays/00-sample/publish.profile
@@ -40,7 +40,7 @@ CONTAINER_ENGINE="docker"
 NEXTCLOUD_CUSTOM_APPS=(
     'https://github.com/westberliner/checksum/releases/download/v1.1.3/checksum.tar.gz'
     'https://github.com/nextcloud/files_antivirus/releases/download/v3.2.2/files_antivirus.tar.gz'
-    'https://github.com/nextcloud/files_automatedtagging/releases/download/v1.11.0/files_automatedtagging-1.11.0.tar.gz'
+    'https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v1.12.0/files_automatedtagging-1.12.0.tar.gz'
     'https://github.com/nextcloud-releases/files_downloadactivity/releases/download/v1.12.0/files_downloadactivity-v1.12.0.tar.gz'
     'https://github.com/nextcloud/files_rightclick/releases/download/v0.15.1/files_rightclick.tar.gz'
     'https://github.com/gino0631/nextcloud-metadata/releases/latest/download/metadata.tar.gz'