diff --git a/zabbix-templates/6.0/nextcloud-zabbix-template.json b/zabbix-templates/6.0/nextcloud-zabbix-template.json
index 53d39f1..747157c 100644
--- a/zabbix-templates/6.0/nextcloud-zabbix-template.json
+++ b/zabbix-templates/6.0/nextcloud-zabbix-template.json
@@ -1,7 +1,7 @@
 {
     "zabbix_export": {
         "version": "6.0",
-        "date": "2024-08-20T09:53:08Z",
+        "date": "2025-07-04T14:08:30Z",
         "groups": [
             {
                 "uuid": "18fce3c341e74778ba11126e46a87ebd",
@@ -17,7 +17,7 @@
                 "uuid": "eddea30a51d94d56875d2dd78fab8120",
                 "template": "Nextcloud",
                 "name": "Nextcloud",
-                "description": "Nextcloud by RCA Systems",
+                "description": "Nextcloud by RCA Systems\nVersion: 6.0-1.0",
                 "groups": [
                     {
                         "name": "Nextcloud Installation"
@@ -238,6 +238,130 @@
                         ]
                     },
                     {
+                        "uuid": "34e27d60db654bac8c6f992502e887fc",
+                        "name": "Number of Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_nr]",
+                        "delay": "1h",
+                        "description": "Number of Team Folders",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_nr"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "uuid": "bd8838e5c10d4ab690008cf4a19267eb",
+                        "name": "Number of Files & Folders in Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_nr_files]",
+                        "delay": "1h",
+                        "description": "Number of files and folders in Team Folders excluding trash and versions",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_nr_files"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "uuid": "b154ebc4b8c54a1282a0e3aab687beb9",
+                        "name": "Number of Trashed Files & Folders in Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_nr_files_trash]",
+                        "delay": "1h",
+                        "description": "Number of trashed files & folders in Team Folders",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_nr_files_trash"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "uuid": "93097d4e1b214e98bc477c147d4fc701",
+                        "name": "Number of Files Versions in Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_nr_files_versions]",
+                        "delay": "1h",
+                        "description": "Number of files versions for files in Team Folders",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_nr_files_versions"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "uuid": "63f6ad4985254b709670b63568150cf5",
+                        "name": "Storage Quota (GB) - Assigned Total for Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_total_quota_gb]",
+                        "delay": "1h",
+                        "value_type": "FLOAT",
+                        "description": "Storage Quota (GB) - Assigned Total for Team Folders",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_total_quota_gb"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "uuid": "c6322e0b7edf4bbe9e5470cc57f2369a",
+                        "name": "Storage Quota Used (GB) - Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_total_size_gb]",
+                        "delay": "1h",
+                        "value_type": "FLOAT",
+                        "description": "Storage quota used by Team Folders, excluding versions and trash",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_total_size_gb"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "uuid": "93f4b8742eb8482a86ed38923ce997ec",
+                        "name": "Storage Quota Used by Trash (GB) - Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_total_trash_size_gb]",
+                        "delay": "1h",
+                        "value_type": "FLOAT",
+                        "description": "Storage quota used by Team Folders, excluding versions and trash",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_total_trash_size_gb"
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        "uuid": "02b0e0d61e3f48969c453b0f7b366b03",
+                        "name": "Storage Quota Used by Versions (GB) - Team Folders",
+                        "key": "nc_teamfolders_metric[teamfolder_total_versions_size_gb]",
+                        "delay": "1h",
+                        "value_type": "FLOAT",
+                        "description": "Storage quota used for files versions by Team Folders",
+                        "preprocessing": [
+                            {
+                                "type": "JSONPATH",
+                                "parameters": [
+                                    "$.teamfolder_total_versions_size_gb"
+                                ]
+                            }
+                        ]
+                    },
+                    {
                         "uuid": "2cc43d1dbefd4a109ec8406e2899654b",
                         "name": "Data Directory Size (GB)",
                         "key": "storage_metric[datadirectory_total_size_gb]",