diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index 51284e4b..26bf12f3 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
-apiVersion: v1
+apiVersion: v2
 name: nextcloud
-version: 2.0.2
+version: 2.1.0
 appVersion: 17.0.0
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
@@ -21,3 +21,16 @@ maintainers:
   email: christian.ingenhaag@googlemail.com
 - name: billimek
   email: jeff@billimek.com
+dependencies:
+- name: postgresql
+  version: 9.1.2
+  repository: https://charts.bitnami.com/bitnami
+  condition: postgresql.enabled
+- name: mariadb
+  version: 7.7.1
+  repository: https://charts.bitnami.com/bitnami
+  condition: mariadb.enabled
+- name: redis
+  version: 10.7.17
+  repository: https://charts.bitnami.com/bitnami
+  condition: redis.enabled
diff --git a/charts/nextcloud/requirements.lock b/charts/nextcloud/requirements.lock
deleted file mode 100644
index 1b07933e..00000000
--- a/charts/nextcloud/requirements.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: mariadb
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 7.1.0
-- name: redis
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 10.0.1
-digest: sha256:88489b3a1a5bf1cd3f9e264e540f8c3515d40020bb1073f3bb281f0da56efc3f
-generated: "2019-11-28T12:08:10.111637339+01:00"
diff --git a/charts/nextcloud/requirements.yaml b/charts/nextcloud/requirements.yaml
deleted file mode 100644
index 396290f5..00000000
--- a/charts/nextcloud/requirements.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-dependencies:
-- name: mariadb
-  version: ~7.1.0
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: mariadb.enabled
-- name: redis
-  version: ~10.0.1
-  repository: https://kubernetes-charts.storage.googleapis.com/
-  condition: redis.enabled
diff --git a/charts/nextcloud/values-mariadb.yaml b/charts/nextcloud/values-mariadb.yaml
deleted file mode 100644
index cc769937..00000000
--- a/charts/nextcloud/values-mariadb.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-internalDatabase:
-  enabled: false
-
-mariadb:
-  enabled: true
\ No newline at end of file
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index 1d65695a..8e3cca06 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -216,13 +216,29 @@ mariadb:
     user: nextcloud
     password: changeme
 
+  replication:
+    enabled: false
+
   ## Enable persistence using Persistent Volume Claims
   ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
   ##
+  master:
+    persistence:
+      enabled: false
+      # storageClass: ""
+      accessMode: ReadWriteOnce
+      size: 8Gi
+
+postgresql:
+  enabled: false
+  global:
+    postgresql:
+      postgresqlUsername: nextcloud
+      postgresqlPassword: changeme
+      postgresqlDatabase: nextcloud
   persistence:
     enabled: false
-    accessMode: ReadWriteOnce
-    size: 8Gi
+    # storageClass: ""
 
 redis:
   enabled: false
diff --git a/ct.yaml b/ct.yaml
index 78418838..cfaefb49 100644
--- a/ct.yaml
+++ b/ct.yaml
@@ -3,4 +3,4 @@ chart-dirs:
   - charts
 chart-repos:
   - stable=https://kubernetes-charts.storage.googleapis.com/
-
+  - bitnami=https://charts.bitnami.com/bitnami