diff --git a/group_vars/all/07_applications.yml b/group_vars/all/07_applications.yml
index d67c36fd..795fdb71 100644
--- a/group_vars/all/07_applications.yml
+++ b/group_vars/all/07_applications.yml
@@ -171,7 +171,8 @@ defaults_applications:
   ## Nextcloud
   nextcloud:
     version:              "production"  # @see https://nextcloud.com/blog/nextcloud-release-channels-and-how-to-track-them/
-    ldap_enabled:         True          # Enables LDAP by default 
+    ldap_enabled:         True          # Enables LDAP by default
+#   database_password:    Null          # Needs to be set in inventory file
 
   ## OAuth2 Proxy
   oauth2_proxy:
diff --git a/roles/docker-nextcloud/vars/main.yml b/roles/docker-nextcloud/vars/main.yml
index caf1ec0f..9e75a424 100644
--- a/roles/docker-nextcloud/vars/main.yml
+++ b/roles/docker-nextcloud/vars/main.yml
@@ -1,6 +1,6 @@
 ---
 application_id:                       "nextcloud"
-database_password:  	                "{{nextcloud_database_password}}"
+database_password:  	                "{{applications.nextcloud.database_password}}"
 database_type:                        "mariadb"
 nextcloud_application_container_name: "nextcloud-application"
 nextcloud_nginx_container_name:       "nextcloud-web"
\ No newline at end of file