diff --git a/zabbix_templates/Template_App_Docker.yaml b/zabbix_templates/Template_App_Docker.yaml
index b004e36..b7051a0 100644
--- a/zabbix_templates/Template_App_Docker.yaml
+++ b/zabbix_templates/Template_App_Docker.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '5.4'
-  date: '2022-01-12T15:22:36Z'
+  date: '2022-01-13T08:42:39Z'
   groups:
     -
       uuid: 7df96b18c230490a9a0a9e2307226338
@@ -132,6 +132,7 @@ zabbix_export:
           uuid: d5c424dc767c4a5ea1ee441e76770411
           name: 'Docker global info'
           key: 'container.docker.check[global]'
+          delay: 5m
           history: '0'
           trends: '0'
           value_type: TEXT
@@ -140,6 +141,7 @@ zabbix_export:
           uuid: e459f638e15f495db3e4a9060e60f7c8
           name: 'Docker: container discovery'
           key: 'container.docker.discovery[containers]'
+          delay: 15m
           lifetime: 7d
           item_prototypes:
             -
@@ -199,6 +201,12 @@ zabbix_export:
                     - $.stats.CPUPerc
               master_item:
                 key: 'container.docker.check[container,{#DOCKER_CONTAINER_NAME}]'
+              trigger_prototypes:
+                -
+                  uuid: d2bdccc7bf8a49c6a2c584a5394a0c27
+                  expression: 'avg(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},CPUPerc],30m)>{$DOCKER_CPU_PCT_WARN}'
+                  name: 'Container {#DOCKER_CONTAINER_NAME} CPU usage is {ITEM.VALUE1}'
+                  priority: WARNING
             -
               uuid: f56ddbaef3af4fa898ae2403a812db3c
               name: 'Docker: Container {#DOCKER_CONTAINER_NAME}: Dead'
@@ -318,8 +326,9 @@ zabbix_export:
                   expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},MemPerc])>{$DOCKER_MEM_PCT_WARN}'
                   recovery_mode: RECOVERY_EXPRESSION
                   recovery_expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},MemPerc])<({$DOCKER_MEM_PCT_WARN}-2)'
-                  name: 'Container {#DOCKER_CONTAINER_NAME} memory usage is at {ITEM.LMASTVALUE1}'
+                  name: 'Container {#DOCKER_CONTAINER_NAME} memory usage is at {ITEM.LASTVALUE1}'
                   priority: AVERAGE
+                  manual_close: 'YES'
             -
               uuid: eb58fb55bc0442319650e32a8ba1faf4
               name: 'Docker: Container {#DOCKER_CONTAINER_NAME}: Network in'
@@ -328,7 +337,7 @@ zabbix_export:
               delay: '0'
               history: 30d
               trends: 1095d
-              units: B/s
+              units: b/s
               preprocessing:
                 -
                   type: JSONPATH
@@ -338,6 +347,10 @@ zabbix_export:
                   type: CHANGE_PER_SECOND
                   parameters:
                     - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
               master_item:
                 key: 'container.docker.check[container,{#DOCKER_CONTAINER_NAME}]'
             -
@@ -348,7 +361,7 @@ zabbix_export:
               delay: '0'
               history: 30d
               trends: 1095d
-              units: B/s
+              units: b/s
               preprocessing:
                 -
                   type: JSONPATH
@@ -358,6 +371,10 @@ zabbix_export:
                   type: CHANGE_PER_SECOND
                   parameters:
                     - ''
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '8'
               master_item:
                 key: 'container.docker.check[container,{#DOCKER_CONTAINER_NAME}]'
             -
@@ -444,7 +461,7 @@ zabbix_export:
                 -
                   uuid: 45e35825ed184b0290d1bc1ed27e48e4
                   expression: 'find(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],,"regexp","^(running|exited)$")<>1'
-                  name: 'Container {#DOCKER_CONTAINER_NAME} status is {ITEM.LASTVALUE1}'
+                  name: 'Container {#DOCKER_CONTAINER_NAME} is {ITEM.LASTVALUE1}'
                   priority: WARNING
                   manual_close: 'YES'
             -
@@ -467,9 +484,27 @@ zabbix_export:
               uuid: b232a5b3aedd4072a56460dd041579b1
               name: 'Docker: container {#DOCKER_CONTAINER_NAME}: Info'
               key: 'container.docker.check[container,{#DOCKER_CONTAINER_NAME}]'
+              delay: 5m
               history: '0'
               trends: '0'
               value_type: TEXT
+          trigger_prototypes:
+            -
+              uuid: 57d9a11b38b246539a82bf4ba1a79a98
+              expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])<{$DOCKER_UPTIME_WARN} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running"'
+              name: 'Container {#DOCKER_CONTAINER_NAME} as just restarted'
+              priority: INFO
+            -
+              uuid: ce3cc3148fa24c6097cbf38b47e9e655
+              expression: 'last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])<{$DOCKER_UPTIME_WARN} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="exited" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running"'
+              name: 'Container {#DOCKER_CONTAINER_NAME} as just started'
+              priority: INFO
+            -
+              uuid: ebdea3b26c624714811124fe4681ccec
+              expression: 'max(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime],15m)<{$DOCKER_UPTIME_WARN} and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Uptime])>0 and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status])="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#2)="running" and last(/Template_App_Docker/container.docker.check[container,{#DOCKER_CONTAINER_NAME},Status],#3)="running"'
+              name: 'Container {#DOCKER_CONTAINER_NAME} seems to restart in a loop'
+              priority: AVERAGE
+              manual_close: 'YES'
           graph_prototypes:
             -
               uuid: 4a9aa378970045399303dcead39c1e53
@@ -529,9 +564,15 @@ zabbix_export:
                     host: Template_App_Docker
                     key: 'container.docker.check[container,{#DOCKER_CONTAINER_NAME},NetIOOut]'
       macros:
+        -
+          macro: '{$DOCKER_CPU_PCT_WARN}'
+          value: '80'
         -
           macro: '{$DOCKER_MEM_PCT_WARN}'
           value: '80'
+        -
+          macro: '{$DOCKER_UPTIME_WARN}'
+          value: '300'
         -
           macro: '{$DOCKER_WARN_NO_LIVE_RESTORE}'
           value: '1'