diff --git a/Storage_Devices/Synology/template_synology_diskstation/6.0/template_synology_diskstation.yaml b/Storage_Devices/Synology/template_synology_diskstation/6.0/template_synology_diskstation.yaml
index 56efe2c85..b3e9585a4 100644
--- a/Storage_Devices/Synology/template_synology_diskstation/6.0/template_synology_diskstation.yaml
+++ b/Storage_Devices/Synology/template_synology_diskstation/6.0/template_synology_diskstation.yaml
@@ -15,7 +15,7 @@ zabbix_export:
       name: 'Synology DiskStation'
       templates:
         -
-          name: 'Template Module ICMP Ping'
+          name: 'ICMP Ping'
       groups:
         -
           name: Templates
@@ -285,7 +285,7 @@ zabbix_export:
           snmp_oid: .1.3.6.1.4.1.6574.1.2.0
           key: synoSystem.temperature
           delay: 3m
-          units: C
+          units: °C
           description: 'Temperature of this NAS.'
           tags:
             -
@@ -567,6 +567,10 @@ zabbix_export:
                   expression: 'last(/Synology DiskStation/host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed[{#IFINDEX},pct])>{$DISK_UTIL_WARN}'
                   name: 'Disk Space is LOW on {#IFDESCR}'
                   priority: WARNING
+                  dependencies:
+                    -
+                      name: "Disk Space is CRITICAL on {#IFDESCR}"
+                      expression: "last(/Synology DiskStation/host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed[{#IFINDEX},pct])>{$DISK_UTIL_HIGH}"
             -
               uuid: ea5dce5e4e3a4a9aa261491ed89775d5
               name: 'Storage Used on {#IFDESCR}'
@@ -917,6 +921,33 @@ zabbix_export:
           delay: 1h
           description: 'For all disk entry.'
           item_prototypes:
+            -
+              uuid: 23866f0f8c634283bd9ac6f06fda4533
+              name: "{#SNMPVALUE} HealthStatus"
+              type: SNMP_AGENT
+              snmp_oid: ".1.3.6.1.4.1.6574.2.1.1.13.{#SNMPINDEX}"
+              key: "synoDisk.diskTable.diskEntry.diskHealthStatus.[{#SNMPINDEX}]"
+              delay: 5m
+              description: |
+                Synology disk health status (DSM 7.1 and above): each meanings of status represented describe below:
+                [1] Normal
+                [2] Warning
+                [3] Critical
+                [4] Failing
+              valuemap:
+                name: "SYNOLOGY-DISK-MIB::diskHealthStatus"
+              tags:
+                -
+                  tag: Application
+                  value: "Synology Disk"
+              trigger_prototypes:
+                -
+                  uuid: 4e673554a7f94715a1453d61a32827c0
+                  expression: "last(/Synology DiskStation/synoDisk.diskTable.diskEntry.diskHealthStatus.[{#SNMPINDEX}])<>1"
+                  name: "{#SNMPVALUE} disk health status"
+                  opdata: "Current status: {ITEM.LASTVALUE1}"
+                  priority: HIGH
+                  description: "The disk is damaged"
             -
               uuid: 8d8dd79307c04518a19a164507fdac5c
               name: '{#SNMPVALUE} Model'
@@ -944,6 +975,7 @@ zabbix_export:
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.6574.2.1.1.5.{#SNMPINDEX}'
               key: 'synoDisk.diskTable.diskEntry.diskStatus.[{#SNMPINDEX}]'
+              delay: 5m
               description: |
                 Synology disk status: each meanings of status represented describe below:
                 [1] Normal: the hard disk functions normally.
@@ -962,6 +994,13 @@ zabbix_export:
                   uuid: 42706ae3d0784f7a8647da128a49e062
                   expression: 'last(/Synology DiskStation/synoDisk.diskTable.diskEntry.diskStatus.[{#SNMPINDEX}])=5'
                   name: '{#SNMPVALUE} disk damaged'
+                  opdata: "Current status: {ITEM.LASTVALUE1}"
+                  priority: HIGH
+                  description: "The disk is damaged"
+                - uuid: a3b8163abab045e38affd30d404a2524
+                  expression: "last(/Synology DiskStation/synoDisk.diskTable.diskEntry.diskStatus.[{#SNMPINDEX}])<>1"
+                  name: "{#SNMPVALUE} disk status"
+                  opdata: "Current status: {ITEM.LASTVALUE1}"
                   priority: HIGH
                   description: 'The disk is damaged'
                 -
@@ -976,7 +1015,8 @@ zabbix_export:
               type: SNMP_AGENT
               snmp_oid: '.1.3.6.1.4.1.6574.2.1.1.6.{#SNMPINDEX}'
               key: 'synoDisk.diskTable.diskEntry.diskTemperature.[{#SNMPINDEX}]'
-              units: C
+              delay: 5m
+              units: °C
               description: 'Synology disk temperature: the temperature of each disk uses Celsius degree.'
               tags:
                 -
@@ -1328,6 +1368,22 @@ zabbix_export:
           macro: '{$DISK_UTIL_WARN}'
           value: '80'
       valuemaps:
+        -
+          uuid: 5e152fbd70b64e93b7be5d1533207852
+          name: "SYNOLOGY-DISK-MIB::diskHealthStatus"
+          mappings:
+            -
+              value: "1"
+              newvalue: Normal
+            -
+              value: "2"
+              newvalue: Warning
+            -
+              value: "3"
+              newvalue: Critical
+            -
+              value: "4"
+              newvalue: Failing
         -
           uuid: 3a17c5b68b454649893d7e32f0c55db7
           name: 'SYNOLOGY-DISK-MIB::diskStatus'
@@ -1426,104 +1482,6 @@ zabbix_export:
             -
               value: '5'
               newvalue: Others
-    -
-      uuid: 37e5eb5606bc4abba66c8b20381a1e8a
-      template: 'Template Module ICMP Ping'
-      name: 'Template Module ICMP Ping'
-      description: 'Template Module ICMP Ping version: 0.12'
-      groups:
-        -
-          name: Templates/Modules
-      items:
-        -
-          uuid: db5a94f6cea14deba957202b2f014469
-          name: 'ICMP ping'
-          type: SIMPLE
-          key: icmpping
-          delay: '60'
-          history: 1w
-          valuemap:
-            name: 'Service state'
-          tags:
-            -
-              tag: Application
-              value: Status
-          triggers:
-            -
-              uuid: b030876299434f3ba43e11c584104a81
-              expression: 'max(/Template Module ICMP Ping/icmpping,#3)=0'
-              name: 'Unavailable by ICMP ping'
-              priority: HIGH
-              description: |
-                Last value: {ITEM.LASTVALUE1}.
-                Last three attempts returned timeout.  Please check device connectivity.
-        -
-          uuid: 04b21adaf422473a88df2c52786474ed
-          name: 'ICMP loss'
-          type: SIMPLE
-          key: icmppingloss
-          delay: '60'
-          history: 1w
-          value_type: FLOAT
-          units: '%'
-          tags:
-            -
-              tag: Application
-              value: Status
-          triggers:
-            -
-              uuid: 42c4b0310aaf4b9c8cb502542b7dea90
-              expression: 'min(/Template Module ICMP Ping/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Template Module ICMP Ping/icmppingloss,5m)<100'
-              name: 'High ICMP ping loss'
-              priority: WARNING
-              dependencies:
-                -
-                  name: 'Unavailable by ICMP ping'
-                  expression: 'max(/Template Module ICMP Ping/icmpping,#3)=0'
-        -
-          uuid: a79e33e5fd264725b934f603fa071555
-          name: 'ICMP response time'
-          type: SIMPLE
-          key: icmppingsec
-          delay: '60'
-          history: 1w
-          value_type: FLOAT
-          units: s
-          tags:
-            -
-              tag: Application
-              value: Status
-          triggers:
-            -
-              uuid: 32b4d8f3eba34bd380803410111d4b7f
-              expression: 'avg(/Template Module ICMP Ping/icmppingsec,5m)>{$ICMP_RESPONSE_TIME_WARN}'
-              name: 'High ICMP ping response time'
-              priority: WARNING
-              dependencies:
-                -
-                  name: 'High ICMP ping loss'
-                  expression: 'min(/Template Module ICMP Ping/icmppingloss,5m)>{$ICMP_LOSS_WARN} and min(/Template Module ICMP Ping/icmppingloss,5m)<100'
-                -
-                  name: 'Unavailable by ICMP ping'
-                  expression: 'max(/Template Module ICMP Ping/icmpping,#3)=0'
-      macros:
-        -
-          macro: '{$ICMP_LOSS_WARN}'
-          value: '20'
-        -
-          macro: '{$ICMP_RESPONSE_TIME_WARN}'
-          value: '0.15'
-      valuemaps:
-        -
-          uuid: bdb5d65d925542eaa61c302dc40fbfe8
-          name: 'Service state'
-          mappings:
-            -
-              value: '0'
-              newvalue: Down
-            -
-              value: '1'
-              newvalue: Up
   graphs:
     -
       uuid: 22fe43ffac72474bb67f4010cb2b3c4b