diff --git a/app/proxmox_backup_server/template_app_proxmox_backup_server_active.yaml b/app/proxmox_backup_server/template_app_proxmox_backup_server_active.yaml
index 3f67784..f2d8f6c 100644
--- a/app/proxmox_backup_server/template_app_proxmox_backup_server_active.yaml
+++ b/app/proxmox_backup_server/template_app_proxmox_backup_server_active.yaml
@@ -1,19 +1,26 @@
 zabbix_export:
   version: '7.0'
   template_groups:
-    - uuid: a4cf0bf4375f4f0c9b3475b7a3531b3b
-      name: damage
+    - uuid: cd6848345eb04289b2d5260c10e0d269
+      name: devloop
+    - uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
+      name: Templates/Applications
   templates:
     - uuid: a0ed4ae0737d47c48938583a15510344
       template: 'PBS Backup Status Active'
       name: 'PBS Backup Status Active'
+      vendor:
+        name: devloop
+        version: '1.1'
       groups:
-        - name: damage
+        - name: devloop
+        - name: Templates/Applications
       items:
         - uuid: a0be013137cf4cd1b579c419cbace3c5
           name: 'PBS JSON'
           type: ZABBIX_ACTIVE
           key: 'devloop.pbs[{HOST.CONN},{$DEVLOOP.PBS.API.PORT},{$DEVLOOP.PBS.API.USER.NAME},{$DEVLOOP.PBS.API.USER.REALM},{$DEVLOOP.PBS.API.USER.TOKEN},{$DEVLOOP.PBS.API.TOKENSECRET}]'
+          delay: 1h
           history: 1h
           value_type: TEXT
           trends: '0'
@@ -36,6 +43,17 @@ zabbix_export:
                     - '$[0].size'
               master_item:
                 key: 'devloop.pbs.backup[{#DATASTORE}, {#NAMESPACE}, {#BACKUP_TYPE}, {#BACKUP_ID}]'
+              tags:
+                - tag: devloop.pbs.backup
+                  value: '{#BACKUP_TYPE}-{#BACKUP_ID}'
+                - tag: devloop.pbs.backup-id
+                  value: '{#BACKUP_ID}'
+                - tag: devloop.pbs.backup-type
+                  value: '{#BACKUP_TYPE}'
+                - tag: devloop.pbs.datastore
+                  value: '{#DATASTORE}'
+                - tag: devloop.pbs.namespace
+                  value: '{#NAMESPACE}'
             - uuid: 30de20ba2d2841b186439b27a1ba4c38
               name: 'PBS Backup Timestamp {#DATASTORE}.{#NAMESPACE} {#BACKUP_TYPE}-{#BACKUP_ID}'
               type: DEPENDENT
@@ -48,6 +66,17 @@ zabbix_export:
                     - '$[0]["backup-time"]'
               master_item:
                 key: 'devloop.pbs.backup[{#DATASTORE}, {#NAMESPACE}, {#BACKUP_TYPE}, {#BACKUP_ID}]'
+              tags:
+                - tag: devloop.pbs.backup
+                  value: '{#BACKUP_TYPE}-{#BACKUP_ID}'
+                - tag: devloop.pbs.backup-id
+                  value: '{#BACKUP_ID}'
+                - tag: devloop.pbs.backup-type
+                  value: '{#BACKUP_TYPE}'
+                - tag: devloop.pbs.datastore
+                  value: '{#DATASTORE}'
+                - tag: devloop.pbs.namespace
+                  value: '{#NAMESPACE}'
             - uuid: bddc15b366be444ebf12d9f2d54ba196
               name: 'PBS Backup {#DATASTORE}.{#NAMESPACE} {#BACKUP_TYPE}-{#BACKUP_ID} JSON'
               type: DEPENDENT