diff --git a/plugins/nextcloud/nextcloud_ b/plugins/nextcloud/nextcloud_
index 2fe2e61f..92db5ec0 100755
--- a/plugins/nextcloud/nextcloud_
+++ b/plugins/nextcloud/nextcloud_
@@ -210,36 +210,36 @@ fetch_url -u "${USERNAME}:${PASSWORD}" "${SCHEME}${DOMAIN}${API_PATH}" \
 	| jq -r '.ocs.data
 		| @text "
 multigraph nextcloud_users_'"${CLEANDOMAIN}"'
-last5minutes \(.activeUsers.last5minutes)
-last1hour \(.activeUsers.last1hour)
-last24hours \(.activeUsers.last24hours)
-num_users \(.nextcloud.storage.num_users)
+last5minutes.value \(.activeUsers.last5minutes)
+last1hour.value \(.activeUsers.last1hour)
+last24hours.value \(.activeUsers.last24hours)
+num_users.value \(.nextcloud.storage.num_users)
 
 multigraph nextcloud_files_'"${CLEANDOMAIN}"'
-num_files \(.nextcloud.storage.num_files)
+num_files.value \(.nextcloud.storage.num_files)
 
 multigraph nextcloud_storages_'"${CLEANDOMAIN}"'
-num_storages \(.nextcloud.storage.num_storages)
-num_storages_local \(.nextcloud.storage.num_storages_local)
-num_storages_home \(.nextcloud.storage.num_storages_home)
-num_storages_other \(.nextcloud.storage.num_storages_other)
+num_storages.value \(.nextcloud.storage.num_storages)
+num_storages_local.value \(.nextcloud.storage.num_storages_local)
+num_storages_home.value \(.nextcloud.storage.num_storages_home)
+num_storages_other.value \(.nextcloud.storage.num_storages_other)
 
 multigraph nextcloud_shares_'"${CLEANDOMAIN}"'
-num_shares \(.nextcloud.shares.num_shares)
-num_shares_user \(.nextcloud.shares.num_shares_user)
-num_shares_groups \(.nextcloud.shares.num_shares_groups)
-num_shares_link \(.nextcloud.shares.num_shares_link)
-num_shares_mail \(.nextcloud.shares.num_shares_mail)
-num_shares_room \(.nextcloud.shares.num_shares_room)
-num_shares_link_no_password \(.nextcloud.shares.num_shares_link_no_password)
-num_fed_shares_sent \(.nextcloud.shares.num_fed_shares_sent)
-num_fed_shares_received \(.nextcloud.shares.num_fed_shares_received)
+num_shares.value \(.nextcloud.shares.num_shares)
+num_shares_user.value \(.nextcloud.shares.num_shares_user)
+num_shares_groups.value \(.nextcloud.shares.num_shares_groups)
+num_shares_link.value \(.nextcloud.shares.num_shares_link)
+num_shares_mail.value \(.nextcloud.shares.num_shares_mail)
+num_shares_room.value \(.nextcloud.shares.num_shares_room)
+num_shares_link_no_password.value \(.nextcloud.shares.num_shares_link_no_password)
+num_fed_shares_sent.value \(.nextcloud.shares.num_fed_shares_sent)
+num_fed_shares_received.value \(.nextcloud.shares.num_fed_shares_received)
 
 multigraph nextcloud_dbsize_'"${CLEANDOMAIN}"'
-db_size \(.server.database.size)
+db_size.value \(.server.database.size)
 
 multigraph nextcloud_apps_'"${CLEANDOMAIN}"'
-num_installed \(.nextcloud.system.apps.num_installed)
-num_updates_available \(.nextcloud.system.apps.num_updates_available)
+num_installed.value \(.nextcloud.system.apps.num_installed)
+num_updates_available.value \(.nextcloud.system.apps.num_updates_available)
 "' \
 	| sed 's/ null$/ U/'