diff --git a/Chart.lock b/Chart.lock
index 1a3caa809d0f607dca06cafe7af73aa09f08c19c..4856075c76538e20241ea3d7ae46ea1bfb7b0d3c 100644
--- a/Chart.lock
+++ b/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: nextcloud
   repository: https://nextcloud.github.io/helm
-  version: 2.14.6
+  version: 3.0.3
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
   version: 10.1.16
diff --git a/Chart.yaml b/Chart.yaml
index 522d11bc130866881d76b7648954d0182638f091..4e37aed323e923b91de2c3d694975ef970516564 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -9,7 +9,7 @@ icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bdd
 dependencies:
   # https://artifacthub.io/packages/helm/nextcloud/nextcloud
   - name: nextcloud
-    version: 2.14.6
+    version: 3.0.3
     repository: "https://nextcloud.github.io/helm"
   # https://artifacthub.io/packages/helm/bitnami/rabbitmq
   - name: rabbitmq
diff --git a/templates/job-configure-nextcloud.yaml b/templates/job-configure-nextcloud.yaml
index 902797bf0f7f34ebe678dbe41aebae4387dece8e..f40d132f9bf79b2a91a4d0b78c72ed5d9b14e8f0 100644
--- a/templates/job-configure-nextcloud.yaml
+++ b/templates/job-configure-nextcloud.yaml
@@ -23,7 +23,7 @@ spec:
       securityContext: {{- include "nextcloud-onlyoffice.securityContext" . | indent 8 }}
       containers:
       - name: {{ .Release.Name }}-configure-nextcloud-job
-        image: {{ .Values.nextcloud.image.repository }}:{{ .Values.nextcloud.image.tag }}
+        image: {{ template "nextcloud.image" .Subcharts.nextcloud }}
         command:
           - "/usr/local/bin/php"
           - "/var/www/html/occ"
diff --git a/templates/job-setup-apps.yaml b/templates/job-setup-apps.yaml
index 929756b43b13cabbbe17b6a8f5a70114e35d793b..30f6f97dc0289105f0ffc63539632556a5b3e3d2 100644
--- a/templates/job-setup-apps.yaml
+++ b/templates/job-setup-apps.yaml
@@ -24,7 +24,7 @@ spec:
       securityContext: {{- include "nextcloud-onlyoffice.securityContext" . | indent 8 }}
       containers:
       - name: {{ .Release.Name }}-setup-apps-job
-        image: {{ .Values.nextcloud.image.repository }}:{{ .Values.nextcloud.image.tag }}
+        image: {{ template "nextcloud.image" .Subcharts.nextcloud }}
         command:
           - "/bin/bash"
           - "/var/local/setup-apps.sh"