diff --git a/zabbix-templates/nextcloud-zabbix-template.json b/zabbix-templates/nextcloud-zabbix-template.json
index 7ffcb10..61149e2 100644
--- a/zabbix-templates/nextcloud-zabbix-template.json
+++ b/zabbix-templates/nextcloud-zabbix-template.json
@@ -14,7 +14,7 @@
         "templates": [
             {
                 "uuid": "eddea30a51d94d56875d2dd78fab8120",
-                "template": "Nextcloud by RCA Systems",
+                "template": "Nextcloud",
                 "name": "Nextcloud",
                 "description": "Nextcloud by RCA Systems",
                 "vendor": {
@@ -68,6 +68,7 @@
                         "name": "Number of Shares",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.shares.num_shares]",
+                        "delay": "5m",
                         "description": "Total number of shares"
                     },
                     {
@@ -75,7 +76,7 @@
                         "name": "Number of Group Shares",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.shares.num_shares_groups]",
-                        "delay": "1h",
+                        "delay": "5m",
                         "description": "Number of shares (group)"
                     },
                     {
@@ -83,7 +84,7 @@
                         "name": "Number of Shares by Link",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.shares.num_shares_link]",
-                        "delay": "1h",
+                        "delay": "5m",
                         "description": "Number of shares (link)"
                     },
                     {
@@ -91,7 +92,7 @@
                         "name": "Number of Shares by Email",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.shares.num_shares_mail]",
-                        "delay": "1h",
+                        "delay": "5m",
                         "description": "Number of shares (mail)"
                     },
                     {
@@ -99,7 +100,7 @@
                         "name": "Number of Shares in Talk Room",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.shares.num_shares_room]",
-                        "delay": "1h",
+                        "delay": "5m",
                         "description": "Number of shares (room)"
                     },
                     {
@@ -107,7 +108,7 @@
                         "name": "Number of Shares with user",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.shares.num_shares_user]",
-                        "delay": "1h",
+                        "delay": "5m",
                         "description": "Number of Shares (User)"
                     },
                     {
@@ -115,7 +116,7 @@
                         "name": "Number of Files",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.storage.num_files]",
-                        "delay": "1h",
+                        "delay": "3h",
                         "description": "Total number of files"
                     },
                     {
@@ -123,7 +124,7 @@
                         "name": "Number of Storage Areas",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.storage.num_storages]",
-                        "delay": "1h",
+                        "delay": "3h",
                         "description": "Number of Storages"
                     },
                     {
@@ -131,7 +132,7 @@
                         "name": "Number of Storage Homes",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.storage.num_storages_home]",
-                        "delay": "1h",
+                        "delay": "3h",
                         "description": "Number of Storages (Home)"
                     },
                     {
@@ -139,7 +140,7 @@
                         "name": "Number of Local Storage Areas",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.storage.num_storages_local]",
-                        "delay": "1h",
+                        "delay": "3h",
                         "description": "Number of Storages (Local)"
                     },
                     {
@@ -147,10 +148,17 @@
                         "name": "Number of External Storage Areas",
                         "type": "ZABBIX_ACTIVE",
                         "key": "nc_metric[ocs.data.nextcloud.storage.num_storages_other]",
-                        "delay": "1h",
+                        "delay": "3h",
                         "description": "Number of Storages (Other)"
                     },
                     {
+                        "uuid": "d15f720b1d1e49cbaaa8220f094cc5ec",
+                        "name": "Number of Users - Total",
+                        "type": "ZABBIX_ACTIVE",
+                        "key": "nc_metric[ocs.data.nextcloud.storage.num_users]",
+                        "delay": "3h"
+                    },
+                    {
                         "uuid": "cca6fc0764e542afa65c3296311be7bc",
                         "name": "Number of Installed Applications",
                         "type": "ZABBIX_ACTIVE",
@@ -240,21 +248,6 @@
                         ]
                     },
                     {
-                        "uuid": "d15f720b1d1e49cbaaa8220f094cc5ec",
-                        "name": "Number of Users - Total",
-                        "type": "ZABBIX_ACTIVE",
-                        "key": "nc_quota_metric[total_number_of_users]",
-                        "delay": "1h",
-                        "preprocessing": [
-                            {
-                                "type": "JSONPATH",
-                                "parameters": [
-                                    "$.total_number_of_users"
-                                ]
-                            }
-                        ]
-                    },
-                    {
                         "uuid": "fdcdce5456c449b5a153c07b12cd86b9",
                         "name": "Storage Quota (GB) - Used Total",
                         "type": "ZABBIX_ACTIVE",
@@ -1402,7 +1395,7 @@
                                                 "name": "itemid",
                                                 "value": {
                                                     "host": "Nextcloud",
-                                                    "key": "nc_quota_metric[total_number_of_users]"
+                                                    "key": "nc_metric[ocs.data.nextcloud.storage.num_users]"
                                                 }
                                             },
                                             {
@@ -1923,11 +1916,11 @@
                         "calc_fnc": "ALL",
                         "item": {
                             "host": "Nextcloud",
-                            "key": "nc_quota_metric[total_number_of_users]"
+                            "key": "nc_metric[ocs.data.nextcloud.storage.num_users]"
                         }
                     }
                 ]
             }
         ]
     }
-}
+}
\ No newline at end of file