diff --git a/charts/stable/nextcloud/.helmignore b/charts/incubator/nextcloud/.helmignore
similarity index 100%
rename from charts/stable/nextcloud/.helmignore
rename to charts/incubator/nextcloud/.helmignore
diff --git a/charts/stable/nextcloud/CONFIG.md b/charts/incubator/nextcloud/CONFIG.md
similarity index 100%
rename from charts/stable/nextcloud/CONFIG.md
rename to charts/incubator/nextcloud/CONFIG.md
diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/incubator/nextcloud/Chart.yaml
similarity index 92%
rename from charts/stable/nextcloud/Chart.yaml
rename to charts/incubator/nextcloud/Chart.yaml
index 761b59fbf31..a2e2cb883eb 100644
--- a/charts/stable/nextcloud/Chart.yaml
+++ b/charts/incubator/nextcloud/Chart.yaml
@@ -28,9 +28,6 @@ maintainers:
 - email: info@truecharts.org
   name: TrueCharts
   url: truecharts.org
-- email: kjeld@schouten-lebbing.nl
-  name: Ornias1993
-  url: truecharts.org
 name: nextcloud
 sources:
 - https://github.com/nextcloud/docker
diff --git a/charts/stable/nextcloud/README.md b/charts/incubator/nextcloud/README.md
similarity index 100%
rename from charts/stable/nextcloud/README.md
rename to charts/incubator/nextcloud/README.md
diff --git a/charts/stable/nextcloud/SCALE/item.yaml b/charts/incubator/nextcloud/SCALE/item.yaml
similarity index 100%
rename from charts/stable/nextcloud/SCALE/item.yaml
rename to charts/incubator/nextcloud/SCALE/item.yaml
diff --git a/charts/stable/nextcloud/SCALE/ix_values.yaml b/charts/incubator/nextcloud/SCALE/ix_values.yaml
similarity index 100%
rename from charts/stable/nextcloud/SCALE/ix_values.yaml
rename to charts/incubator/nextcloud/SCALE/ix_values.yaml
diff --git a/charts/stable/nextcloud/SCALE/questions.yaml b/charts/incubator/nextcloud/SCALE/questions.yaml
similarity index 100%
rename from charts/stable/nextcloud/SCALE/questions.yaml
rename to charts/incubator/nextcloud/SCALE/questions.yaml
diff --git a/charts/stable/nextcloud/templates/_configmap.tpl b/charts/incubator/nextcloud/templates/_configmap.tpl
similarity index 100%
rename from charts/stable/nextcloud/templates/_configmap.tpl
rename to charts/incubator/nextcloud/templates/_configmap.tpl
diff --git a/charts/stable/nextcloud/templates/_cronjob.tpl b/charts/incubator/nextcloud/templates/_cronjob.tpl
similarity index 100%
rename from charts/stable/nextcloud/templates/_cronjob.tpl
rename to charts/incubator/nextcloud/templates/_cronjob.tpl
diff --git a/charts/stable/nextcloud/templates/_secrets.tpl b/charts/incubator/nextcloud/templates/_secrets.tpl
similarity index 100%
rename from charts/stable/nextcloud/templates/_secrets.tpl
rename to charts/incubator/nextcloud/templates/_secrets.tpl
diff --git a/charts/stable/nextcloud/templates/common.yaml b/charts/incubator/nextcloud/templates/common.yaml
similarity index 100%
rename from charts/stable/nextcloud/templates/common.yaml
rename to charts/incubator/nextcloud/templates/common.yaml
diff --git a/charts/stable/nextcloud/values.yaml b/charts/incubator/nextcloud/values.yaml
similarity index 100%
rename from charts/stable/nextcloud/values.yaml
rename to charts/incubator/nextcloud/values.yaml
diff --git a/charts/stable/postgresql/templates/backup-postgres-config.yaml b/charts/stable/postgresql/templates/backup-postgres-config.yaml
index b350f44035b..e52eb2ed5a1 100644
--- a/charts/stable/postgresql/templates/backup-postgres-config.yaml
+++ b/charts/stable/postgresql/templates/backup-postgres-config.yaml
@@ -12,4 +12,4 @@ data:
     until pg_isready; do
       sleep 5;
     done;
-    pg_dump -U $POSTGRES_USER -d {{ .Values.postgresqlDatabase }} > /dbbackups/$BACKUP_NAME;
+    pg_dump -U {{ .Values.postgresqlUser }} -d {{ .Values.postgresqlDatabase }} > /dbbackups/$BACKUP_NAME;