diff --git a/host_vars/docker2.grote.lan.yml b/host_vars/docker2.grote.lan.yml
index 4feb6658..a516789e 100644
--- a/host_vars/docker2.grote.lan.yml
+++ b/host_vars/docker2.grote.lan.yml
@@ -58,6 +58,14 @@
         [docker_*]
         user root
         env.DOCKER_HOST unix://run/docker.sock
+    - name: nextcloud_mgrote.next-cloud.org
+      src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/nextcloud_
+      config: |
+        [nextcloud_mgrote.next-cloud.org]
+        env.username munin
+        env.password "{{ lookup('keepass', 'nextcloud_munin_user', 'password') }}"
+        env.api_path /ocs/v2.php/apps/serverinfo/api/v1/info
+        env.scheme https
     - name: docker_cpu
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/docker_
     - name: docker_memory
@@ -72,7 +80,7 @@
         [mt_system_crs309]
         user root
         env.ssh_user munin
-        env.ssh_password hallowelt
+        env.ssh_password "{{ lookup('keepass', 'crs309_munin_user', 'password') }}"
         env.ssh_host 192.168.2.223
     - name: mt_system_rb5009
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/mikrotik/mt_system
@@ -80,7 +88,7 @@
         [mt_system_rb5009]
         user root
         env.ssh_user munin
-        env.ssh_password hallowelt
+        env.ssh_password "{{ lookup('keepass', 'rb5009_munin_user', 'password') }}"
         env.ssh_host 192.168.2.1
     - name: unifi
       src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/unifi
@@ -90,7 +98,7 @@
         # point to a read-only account.
         env.user munin
         # Password to login to unifi controller API. Default is "ubnt"
-        env.pass hallowelt
+        env.pass "{{ lookup('keepass', 'unifi_munin_user', 'password') }}
         # URL of the API, with port if needed.  No trailing slash.
         env.api_url https://docker2.grote.lan:8443
         # Verify SSL certificate name against host.
diff --git a/keepass_db.kdbx b/keepass_db.kdbx
index 1571b28a..20eb0ba2 100644
Binary files a/keepass_db.kdbx and b/keepass_db.kdbx differ