diff --git a/.github/ct-install.yaml b/.github/ct-install.yaml
index ebcb62dd350..0c66386fe7f 100644
--- a/.github/ct-install.yaml
+++ b/.github/ct-install.yaml
@@ -1,6 +1,6 @@
 remote: origin
 target-branch: master
-helm-extra-args: --timeout 240s
+helm-extra-args: --timeout 250s
 chart-yaml-schema: .github/chart_schema.yaml
 chart-dirs:
   - charts/incubator
diff --git a/charts/incubator/nextcloud/.helmignore b/charts/stable/nextcloud/.helmignore
similarity index 100%
rename from charts/incubator/nextcloud/.helmignore
rename to charts/stable/nextcloud/.helmignore
diff --git a/charts/incubator/nextcloud/CHANGELOG.md b/charts/stable/nextcloud/CHANGELOG.md
similarity index 100%
rename from charts/incubator/nextcloud/CHANGELOG.md
rename to charts/stable/nextcloud/CHANGELOG.md
diff --git a/charts/incubator/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml
similarity index 98%
rename from charts/incubator/nextcloud/Chart.yaml
rename to charts/stable/nextcloud/Chart.yaml
index 811b54c6a89..d67d58a089c 100644
--- a/charts/incubator/nextcloud/Chart.yaml
+++ b/charts/stable/nextcloud/Chart.yaml
@@ -29,7 +29,7 @@ sources:
   - https://github.com/nextcloud/docker
   - https://github.com/nextcloud/helm
 type: application
-version: 20.1.2
+version: 21.0.0
 annotations:
   truecharts.org/catagories: |
     - cloud
diff --git a/charts/incubator/nextcloud/LICENSE b/charts/stable/nextcloud/LICENSE
similarity index 100%
rename from charts/incubator/nextcloud/LICENSE
rename to charts/stable/nextcloud/LICENSE
diff --git a/charts/incubator/nextcloud/README.md b/charts/stable/nextcloud/README.md
similarity index 100%
rename from charts/incubator/nextcloud/README.md
rename to charts/stable/nextcloud/README.md
diff --git a/charts/incubator/nextcloud/ci/basic-values.yaml b/charts/stable/nextcloud/ci/basic-values.yaml
similarity index 100%
rename from charts/incubator/nextcloud/ci/basic-values.yaml
rename to charts/stable/nextcloud/ci/basic-values.yaml
diff --git a/charts/incubator/nextcloud/docs/img/nextcloud-cli.png b/charts/stable/nextcloud/docs/img/nextcloud-cli.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/nextcloud-cli.png
rename to charts/stable/nextcloud/docs/img/nextcloud-cli.png
diff --git a/charts/incubator/nextcloud/docs/img/pgadmin-backup.png b/charts/stable/nextcloud/docs/img/pgadmin-backup.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/pgadmin-backup.png
rename to charts/stable/nextcloud/docs/img/pgadmin-backup.png
diff --git a/charts/incubator/nextcloud/docs/img/pgadmin-connection1.png b/charts/stable/nextcloud/docs/img/pgadmin-connection1.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/pgadmin-connection1.png
rename to charts/stable/nextcloud/docs/img/pgadmin-connection1.png
diff --git a/charts/incubator/nextcloud/docs/img/pgadmin-connection2.png b/charts/stable/nextcloud/docs/img/pgadmin-connection2.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/pgadmin-connection2.png
rename to charts/stable/nextcloud/docs/img/pgadmin-connection2.png
diff --git a/charts/incubator/nextcloud/docs/img/pgadmin-restore1.png b/charts/stable/nextcloud/docs/img/pgadmin-restore1.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/pgadmin-restore1.png
rename to charts/stable/nextcloud/docs/img/pgadmin-restore1.png
diff --git a/charts/incubator/nextcloud/docs/img/pgadmin-restore2.png b/charts/stable/nextcloud/docs/img/pgadmin-restore2.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/pgadmin-restore2.png
rename to charts/stable/nextcloud/docs/img/pgadmin-restore2.png
diff --git a/charts/incubator/nextcloud/docs/img/pgadmin-restore3.png b/charts/stable/nextcloud/docs/img/pgadmin-restore3.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/pgadmin-restore3.png
rename to charts/stable/nextcloud/docs/img/pgadmin-restore3.png
diff --git a/charts/incubator/nextcloud/docs/img/pgadmin-restore4.png b/charts/stable/nextcloud/docs/img/pgadmin-restore4.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/pgadmin-restore4.png
rename to charts/stable/nextcloud/docs/img/pgadmin-restore4.png
diff --git a/charts/incubator/nextcloud/docs/img/tcdbinfo-output.png b/charts/stable/nextcloud/docs/img/tcdbinfo-output.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/tcdbinfo-output.png
rename to charts/stable/nextcloud/docs/img/tcdbinfo-output.png
diff --git a/charts/incubator/nextcloud/docs/img/userdata-clean.png b/charts/stable/nextcloud/docs/img/userdata-clean.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/userdata-clean.png
rename to charts/stable/nextcloud/docs/img/userdata-clean.png
diff --git a/charts/incubator/nextcloud/docs/img/userdata-old.png b/charts/stable/nextcloud/docs/img/userdata-old.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/userdata-old.png
rename to charts/stable/nextcloud/docs/img/userdata-old.png
diff --git a/charts/incubator/nextcloud/docs/img/userdata-perms.png b/charts/stable/nextcloud/docs/img/userdata-perms.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/userdata-perms.png
rename to charts/stable/nextcloud/docs/img/userdata-perms.png
diff --git a/charts/incubator/nextcloud/docs/img/userdata-setting.png b/charts/stable/nextcloud/docs/img/userdata-setting.png
similarity index 100%
rename from charts/incubator/nextcloud/docs/img/userdata-setting.png
rename to charts/stable/nextcloud/docs/img/userdata-setting.png
diff --git a/charts/incubator/nextcloud/docs/migration-guide.md b/charts/stable/nextcloud/docs/migration-guide.md
similarity index 100%
rename from charts/incubator/nextcloud/docs/migration-guide.md
rename to charts/stable/nextcloud/docs/migration-guide.md
diff --git a/charts/incubator/nextcloud/icon.png b/charts/stable/nextcloud/icon.png
similarity index 100%
rename from charts/incubator/nextcloud/icon.png
rename to charts/stable/nextcloud/icon.png
diff --git a/charts/incubator/nextcloud/questions.yaml b/charts/stable/nextcloud/questions.yaml
similarity index 100%
rename from charts/incubator/nextcloud/questions.yaml
rename to charts/stable/nextcloud/questions.yaml
diff --git a/charts/incubator/nextcloud/templates/NOTES.txt b/charts/stable/nextcloud/templates/NOTES.txt
similarity index 100%
rename from charts/incubator/nextcloud/templates/NOTES.txt
rename to charts/stable/nextcloud/templates/NOTES.txt
diff --git a/charts/incubator/nextcloud/templates/_configmap.tpl b/charts/stable/nextcloud/templates/_configmap.tpl
similarity index 100%
rename from charts/incubator/nextcloud/templates/_configmap.tpl
rename to charts/stable/nextcloud/templates/_configmap.tpl
diff --git a/charts/incubator/nextcloud/templates/_cronjobs.tpl b/charts/stable/nextcloud/templates/_cronjobs.tpl
similarity index 100%
rename from charts/incubator/nextcloud/templates/_cronjobs.tpl
rename to charts/stable/nextcloud/templates/_cronjobs.tpl
diff --git a/charts/incubator/nextcloud/templates/_ingressInjector.tpl b/charts/stable/nextcloud/templates/_ingressInjector.tpl
similarity index 100%
rename from charts/incubator/nextcloud/templates/_ingressInjector.tpl
rename to charts/stable/nextcloud/templates/_ingressInjector.tpl
diff --git a/charts/incubator/nextcloud/templates/_initPerms.tpl b/charts/stable/nextcloud/templates/_initPerms.tpl
similarity index 100%
rename from charts/incubator/nextcloud/templates/_initPerms.tpl
rename to charts/stable/nextcloud/templates/_initPerms.tpl
diff --git a/charts/incubator/nextcloud/templates/_validation.tpl b/charts/stable/nextcloud/templates/_validation.tpl
similarity index 100%
rename from charts/incubator/nextcloud/templates/_validation.tpl
rename to charts/stable/nextcloud/templates/_validation.tpl
diff --git a/charts/incubator/nextcloud/templates/_waitNextcloud.tpl b/charts/stable/nextcloud/templates/_waitNextcloud.tpl
similarity index 100%
rename from charts/incubator/nextcloud/templates/_waitNextcloud.tpl
rename to charts/stable/nextcloud/templates/_waitNextcloud.tpl
diff --git a/charts/incubator/nextcloud/templates/common.yaml b/charts/stable/nextcloud/templates/common.yaml
similarity index 100%
rename from charts/incubator/nextcloud/templates/common.yaml
rename to charts/stable/nextcloud/templates/common.yaml
diff --git a/charts/incubator/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml
similarity index 100%
rename from charts/incubator/nextcloud/values.yaml
rename to charts/stable/nextcloud/values.yaml